Delete "node" file and resume POHIAda support

templates-parser @ 844cfcc6

-Subproject commit 0655d36712e079dcf975afb4a1075353cbfdad14
+Subproject commit 844cfcc630139c0c9c3c2c41f549946a26ee06c0

templates/concurrency_view/aadl_1_nodes/README.md

-Generate the "nodes" file needed by the orchestrator
-SOON DEPRECATED

templates/concurrency_view/aadl_1_nodes/block.tmplt

-@@-- The following tags are available in this template:
-@@--
-@@-- @_Name_@             : Protected block name
-@@-- @_Language_@         : Implementation language
-@@-- @_Calling_Threads_@  : List of calling threads
-@@-- @_Node name_@        : Node name
-@@-- @_Protected_PIs_@    : Protected Provided interfaces (from pi.tmplt)
-@@-- @_Unprotected_PIs_@  : Unprotected Provided interfaces (from pi.tmplt)
-@@-- @_Required_@         : Required interfaces (from ri.tmplt)

templates/concurrency_view/aadl_1_nodes/fileblock.tmplt

-@@-- Specify the file name for a protected block
-@@-- @_Block_Name_@ is available.
-@@-- Don't specify anything if you don't want the file to be created

templates/concurrency_view/aadl_1_nodes/filenode.tmplt

-@@-- The following tags are available in this template:
-@@--
-@@-- @_Node_Name_@        : Name of the node as defined in the Deployment View
-@@-- The content of this file is generated from node.tmplt
-@@-- If there is no string defined here, no file will be generated per node,
-@@-- (that's an option if the intent is to generate only one file per system)

templates/concurrency_view/aadl_1_nodes/filepart.tmplt

-@@-- Specify the file name for a partition
-@@-- @_Partition_Name_@ is available.
-@@-- Don't specify anything if you don't want the file to be created

templates/concurrency_view/aadl_1_nodes/filesys.tmplt

-@@-- Specify the file name for the complete system (including nodes)
-@@-- (no template tag)
-nodes

templates/concurrency_view/aadl_1_nodes/filethread.tmplt

-@@-- Specify the file name for a thread
-@@-- @_Thread_Name_@ is available.
-@@-- Don't specify anything if you don't want the file to be created

templates/concurrency_view/aadl_1_nodes/node.tmplt

-@@-- The following tags are available in this template:
-@@--
-@@-- @_Node_Name_@       : Name of the node from deployment view
-@@-- @_Partition_Names_@ : Tag listing the partitions in this node
-@@-- @_Partitions_@      : List of rendered code for partitions
-@@-- @_CPU_Name_@, _Platform_@, _Classifier_@, _Ada_Runtime_@ : Info about CPU
-@@-- In standard TASTE systems there is only one partition per node
---  node: @_Node_Name_@
-@_Partitions_@

templates/concurrency_view/aadl_1_nodes/partition.tmplt

-@@-- The following tags are available in this template:
-@@--
-@@-- @_Name_@            : Partition name (usually the name of the binary)
-@@-- @_Threads_@         : Code generated for the threads
-@@-- @_Thread_Names_@    : Tag: list of thread names
-@@-- @_Node_Name_@       : Name of the node containing this partition
-@@-- @_Blocks_@          : Code generated for protected functions
-@@-- @_Coverage_@        : True if user requested code coverage enable
-@@-- @_Package_Name_@    : AADL Package name for the target (e.g. ocarina_porocessors_x86)
-@@-- @_CPU_Name_@        : CPU Name (e.g. x86_linux)
-@@-- @_CPU_Platform_@    : AADL CPU_Platform (e.g. PLATFORM_NATIVE)
-@@-- @_CPU_Classifier_@  : AADL CPU Classifier (e.g. ocarina_processors_x86::x86.linux)
-@@-- @_Bound_Functions_@ : List of user functions from Interface view
-@@-- @_Thread_Src_Name_@ : Vector tag : connection thread name (source)
-@@-- @_Thread_Dst_Name_@ : Vector tag : connection thread name (dest)
-@@-- @_Thread_Src_Port_@ : Vector tag : connection port name (source)
-@@-- @_Thread_Dst_Port_@ : Vector tag : connection port name (dest)
-* @_LOWER:Name_@ @_CPU_Platform_@
-@@TABLE@@
-@_Bound_Functions_@
-@@END_TABLE@@
-@_LOWER:Name_@_taste_api@_Threads_@

templates/concurrency_view/aadl_1_nodes/pi.tmplt

-@@-- The following tags are available in this template:
-@@--
-@@-- @_Name_@                : The name of the interface
-@@-- @_Direction_@           : "PI" or "RI"
-@@-- @_Kind_@                : The RCM Kind
-@@-- @_Parent_Function_@     : The name of the function
-@@-- @_Param_Names_@         : List of parameter names
-@@-- @_Param_Types_@         :   |_ Corresponding parameter types
-@@-- @_Param_Directions_@    :   |_ Corresponding direction

templates/concurrency_view/aadl_1_nodes/ri.tmplt

-@@-- The following tags are available in this template:
-@@--
-@@-- @_Name_@                : The name of the interface
-@@-- @_Direction_@           : "PI" or "RI"
-@@-- @_Kind_@                : The RCM Kind
-@@-- @_Parent_Function_@     : The name of the function
-@@-- @_Param_Names_@         : List of parameter names
-@@-- @_Param_Types_@         :   |_ Corresponding parameter types
-@@-- @_Param_Directions_@    :   |_ Corresponding direction
-

templates/concurrency_view/aadl_1_nodes/system.tmplt

-@@-- The following tags are available in this template:
-@@--
-@@-- @_Nodes_@               : Code generated for the nodes
-@@-- @_Node_Names_@          : Vector Tag of node names
-@@-- @_Node_CPU_@            :  |_ Corresponding CPU name (eg x86_linux)
-@@-- @_Node_CPU_Classifier_@ :  |_ CPU Classifier (ocarina...::x86_linux)
-@@-- @_Partition_Names_@     : Vector Tag of partition names
-@@-- @_Partition_Node_@      :  |_ Corresponding node name
-@@-- @_Partition_CPU_@       :  |_ Corresponding CPU name
-@@-- @_Threads_@             : Code generated for the threads
-@@-- @_Thread_Names_@        : List of all threads in the complete system
-@@-- @_Target_Packages_@     : List of all target package names in the complete system
-@@-- And all the system configuration obtained from the command line:
-@@-- Interface_View, Deployment_View, Data_View, Binary_Path, Check_Data_View,
-@@-- Output_Dir, Skeletons, Glue, Use_POHIC, Timer_Resolution, Debug_Flag,
-@@-- No_Stdlib_Flag, Timer_Resolution, Other_Files (list of aadl files)
-
---  Input file for the taste orchestrator: do not edit
---  This file was generated automatically by taste/kazoo
-@_Nodes_@

templates/concurrency_view/aadl_1_nodes/thread.tmplt

-@@-- The following tags are available in this template:
-@@--
-@@-- @_Thread_Name_@       : Thread name
-@@-- @_Entry_Port_Name_@   : Name of the PI
-@@-- @_RCM_@               : One of "CYCLIC_OPERATION", "SPORADIC_OPERATION"
-@@-- @_Pro_Block_Name_@    : Name of the protected function
-@@-- @_Node_Name_@         : Name of the deployment node
-@@-- @_Remote_Threads_@    : Vector tag: output remote thread list
-@@-- @_RI_Port_Name_@      :    |_ Corresponding local RI name
-@@-- @_Remote_PIs_@        :    |_ Associated PI Name
-@@-- @_Remote_PI_Sorts_@   :    |_ Optional param type of the remote thread
-@@-- @_Remote_PI_Modules_@ :    |_ Asn1 module of the optional param type
-@@-- Tags related to the PI that is at the origin of the thread creation:
-@@-- @_Name_@, @_Kind_@, @_Parent_Function_@   : shoud be useless here
-@@-- @_Param_Names_@, _Types_@, _ASN1_Modules, _Encodings_@, _Directions_@ : param vector tag
-@@-- @_Period_@, @_WCET_@, @_Queue_Size_@ : relevant here
-@@-- @_IF_Property_Names_@, _Values_@ : user properties (vector tag)
-@@--
-@@-- Matrix of output ports: Remote thread/corresponding remote PI @_Name_@
-@_Thread_Name_@

templates/concurrency_view/aadl_1_nodes/trigger.tmplt

-@@-- The following boolean tags are available to decide if the file
-@@-- shall be generated or not:
-@@--    Filename_Is_Present
-@@--    Skeletons
-@@--    Glue
-@@--    POHIC
-@@--    Debug
-@@--    No_Stdlib
-FALSE

templates/concurrency_view/ada_wrappers_body/block.tmplt

@@ -19,7 +19,7 @@ package body @_CAPITALIZE:Name_@_Block is
    end @_CAPITALIZE:Name_@_Protected;
    @@END_IF@@
 
-   @_Unprotected_PIs_'Indent_@
+   @_Unprotected_PIs'Indent_@
 
 end @_CAPITALIZE:Name_@_Block;
 

templates/concurrency_view/ada_wrappers_source/block.tmplt

@@ -23,6 +23,6 @@ package @_CAPITALIZE:Name_@_Block is
    end @_CAPITALIZE:Name_@_Protected;
    @@END_IF@@
 
-   @_Unprotected_PIs_'Indent_@
+   @_Unprotected_PIs'Indent_@
 end @_CAPITALIZE:Name_@_Block;
 

templates/concurrency_view/ada_wrappers_source/thread.tmplt

@@ -18,11 +18,12 @@
 @@-- @_IF_Property_Names_@, _Values_@ : user properties (vector tag)
 @@--
 @@-- Matrix of output ports: Remote thread/corresponding remote PI @_Name_@
-with PolyORB_HI_Generated.Types,
-     PolyORB_HI_Generated.Deployment;
-
-use PolyORB_HI_Generated.Deployment,
-    PolyORB_HI_Generated.Types;
+@@IF@@ @_Param_Names'Length_@ > 0
+with PolyORB_HI_Generated.Types;
+use  PolyORB_HI_Generated.Types;
+@@END_IF@@
+with PolyORB_HI_Generated.Deployment;
+use  PolyORB_HI_Generated.Deployment;
 
 
 with @_CAPITALIZE:Pro_Block_Name_@_Block;

templates/skeletons/makefile.tmplt

@@ -25,7 +25,7 @@ export PROJECT_CACHE=${HOME}/.taste_AST_cache
 
 all:	build-default
 
-@@-- global check to see if dataview in Ada is needed
+@@-- global check to check which dataviews are neeeded
 @@TABLE@@
   @@IF@@ @_Unique_Languages_@ = "Ada" or @_Unique_Languages_@ = "SDL"
      @@SET@@ Need_Ada=TRUE

test/Demo_C/Makefile

@@ -5,7 +5,7 @@ export USER_LDFLAGS=
 # you can add folders with source code you want to compile
 export EXTERNAL_SOURCE_PATH=
 
-all: c
+all: c ada
 
 ada: kazoo-ada
 	cp simple_c_function/*.c output.ada/simple_c_function/C/src