multiple optimizations

templates/concurrency_view/aadl_4_makefile/node.tmplt

@@ -5,25 +5,30 @@
 @@-- @_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
+# Build of node @_Node_Name_@ for @_CPU_Platform_@
 @@INLINE@@
-@_LOWER:Node_Name_@_native :
+@_LOWER:Node_Name_@_@_CPU_Name_@ :
    @@TABLE@@
-      @_LOWER:Partition_Names_@_native
+      @_LOWER:Partition_Names_@
    @@END_TABLE@@
- @@END_INLINE@@
+ DriversConfig/drivers_config.h
+@@END_INLINE@@
+	make -j -C @_Node_Name_@ -f Makefile.@_Node_Name_@
 
+# Build of node @_Node_Name_@ for RTEMS
 @@INLINE@@
 @_LOWER:Node_Name_@_rtems_ada :
    @@TABLE@@
       @_LOWER:Partition_Names_@_rtems_ada
    @@END_TABLE@@
- @@END_INLINE@@
+@@END_INLINE@@
 
+# Build of node @_Node_Name_@ for AIR
 @@INLINE@@
 @_LOWER:Node_Name_@_air :
    @@TABLE@@
       @_LOWER:Partition_Names_@_rtems_ada
    @@END_TABLE@@
- @@END_INLINE@@
+@@END_INLINE@@
 
 @_Partitions_@

templates/concurrency_view/aadl_4_makefile/partition.tmplt

@@ -8,7 +8,7 @@
 @@-- @_Block_Names@      : Vector Tag: list of block (user functions) names
 @@-- @_Block_Languages@  :   |_ Corresponding implementation language
 @@-- @_Coverage_@        : True if user requested code coverage enable
-@@-- @_Package_Name_@    : AADL Package name for the target (e.g. ocarina_porocessors_x86)
+@@-- @_Package_Name_@    : AADL Package name for the target (e.g. ocarina_processors_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)
@@ -20,14 +20,16 @@
 @@-- @_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)
+#  Build of partition @_Name_@ (common to all targets)
 @@INLINE()( )(\n)@@
-@_LOWER:Name_@_native :
+@_LOWER:Name_@:
    @@TABLE@@
       @_LOWER:Block_Names_@
    @@END_TABLE@@
 @@END_INLINE@@
 
-@_LOWER:Name_@_rtems_ada : @_LOWER:Name_@_native
+# Build of partition @_Name_@ for RTEMS
+@_LOWER:Name_@_rtems_ada : @_LOWER:Name_@
 @@-- On RTEMS if using POHIC we need to have adainit created for Ada functions
 @@--@@IF@@ @_CPU_Platform_@ /= PLATFORM_NATIVE
 	mkdir -p @_LOWER:Name_@_adainit && \

templates/concurrency_view/aadl_4_makefile/system.tmplt

@@ -45,24 +45,15 @@
 @@INLINE()( )()@@
 all:
 @@TABLE@@
-@_LOWER:Node_Names_@_native
+@_LOWER:Node_Names_@_@_Node_CPU_@
 @@END_TABLE@@
-@@IF@@ @_Device_Names'Length_@ > 0
-DriversConfig/drivers_config.h
-@@END_IF@@
 @@END_INLINE@@
-@@TABLE@@
-	make -j -C @_Node_Names_@ -f Makefile.@_Node_Names_@
-@@END_TABLE@@
 
 @@INLINE()( )()@@
 rtems_ada:
 @@TABLE@@
 @_LOWER:Node_Names_@_rtems_ada
 @@END_TABLE@@
-@@IF@@ @_Device_Names'Length_@ > 0
-DriversConfig/drivers_config.h
-@@END_IF@@
 @@END_INLINE@@
 @@TABLE@@
 	make -j -C @_Node_Names_@ -f Makefile.@_Node_Names_@ debug_rtems_leon3_with_ada
@@ -95,6 +86,8 @@ air:
 DriversConfig/drivers_config.h:	drivers_config.asn
 	mkdir -p DriversConfig
 	asn1.exe -o DriversConfig -c drivers_config.asn @_REPLACE_ALL(,/ ):UNIQ(,):Device_ASN1_File_@
+@@ELSE@@
+DriversConfig/drivers_config.h:  # Not a distributed system
 @@END_IF@@
 
 @_Nodes_@

templates/concurrency_view/air_gpr/partition.tmplt

@@ -121,7 +121,6 @@ project @_CAPITALIZE:Name_@_AIR is
        "config_leon4_n2x.c",
        "grspw_api.c",
        "grspw_pkt_lib.c",
-       "hyperperriod_config.hh",
        "po_hi_driver_drvmgr_common.c",
        "po_hi_driver_exarm.c",
        "po_hi_driver_exarm_ni_6071e_analog.c",
@@ -150,11 +149,9 @@ project @_CAPITALIZE:Name_@_AIR is
        "po_hi_monitor.c",
        "po_hi_simulink.c",
        "po_hi_storage.c",
-       "remote_configuration.cc",
        "spwrouter_custom_config.c",
        "star_dundee_api.c",
        "trace_manager.c",
-       "trace_manager.cc",
        "um_threads.c");
 
 end @_CAPITALIZE:Name_@_AIR;

templates/concurrency_view/c_pohi_gpr/partition.tmplt

@@ -95,7 +95,6 @@ project @_CAPITALIZE:Name_@ is
        "config_leon4_n2x.c",
        "grspw_api.c",
        "grspw_pkt_lib.c",
-       "hyperperriod_config.hh",
        "po_hi_driver_exarm.c",
        "po_hi_driver_exarm_ni_6071e_analog.c",
        "po_hi_driver_exarm_ni_6071e_digital.c",
@@ -119,7 +118,6 @@ project @_CAPITALIZE:Name_@ is
        "po_hi_lua.c",
        "po_hi_simulink.c",
        "po_hi_storage.c",
-       "remote_configuration.cc",
        "spwrouter_custom_config.c",
        "star_dundee_api.c",
        "trace_manager.c",

templates/concurrency_view/c_pohi_rtems_with_ada_gpr/partition.tmplt

@@ -107,7 +107,6 @@ project @_CAPITALIZE:Name_@_RTEMS_Ada is
        "config_leon3_drvmgr.c",
        "grspw_api.c",
        "grspw_pkt_lib.c",
-       "hyperperriod_config.hh",
        "po_hi_driver_drvmgr_common.c",
        "marshallers.c",  -- only for distributed systems
 @@IF@@ @_In_Port_Names'Length_@ = 0 and @_Out_Port_Names'Length_@ = 0 and @_Thread_Src_Port'Length_@ = 0
@@ -143,11 +142,9 @@ project @_CAPITALIZE:Name_@_RTEMS_Ada is
        "po_hi_monitor.c",
        "po_hi_simulink.c",
        "po_hi_storage.c",
-       "remote_configuration.cc",
        "spwrouter_custom_config.c",
        "star_dundee_api.c",
        "trace_manager.c",
-       "trace_manager.cc",
        "um_threads.c");
 
 

templates/skeletons/makefile.tmplt

@@ -115,10 +115,10 @@ dataview/C/built: ${DATAVIEW_UNIQ}
            @@--  do nothing, C is always done, only once
 	   @@ELSIF@@ @_Unique_Languages_@ = "GUI"
            @@--  for DMT, GUI means Python
-dataview/Python/built: ${DATAVIEW_UNIQ}
+dataview/Python/built: dataview/C/built
 	mkdir -p $(dir $@)
 	asn2dataModel -o $(dir $@) -toPython ${DATAVIEW_UNIQ}  @@-- Ignore context parameters for python interface
-	$(MAKE) -C dataview/Python -f Makefile.python
+	$(MAKE) -j1 -C dataview/Python -f Makefile.python
         @@TABLE@@
         @@IF@@ @_Language_@ = GUI
 	cp  dataview/Python/* @_LOWER:Function_Names_@/GUI/wrappers/python