Commit 5c5785a7 authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Merge branch 'feature_improveTemplates' into 'master'

Feature improve templates

See merge request !33
parents 8dfd19dc 48d20ecb
Pipeline #1805 passed with stage
in 8 minutes and 51 seconds
......@@ -970,13 +970,10 @@ This template is evaluated for every block.
|DOCUMENTATION MISSING
|-
|Has_Context
|DOCUMENTATION MISSING
|True if function has context parameters
|-
|Output_Dir
|DOCUMENTATION MISSING
|-
|Instance_Of
|DOCUMENTATION MISSING
|Output folder (by default: work)
|-
|PIs_Have_Params
|DOCUMENTATION MISSING
......@@ -1005,9 +1002,6 @@ This template is evaluated for every block.
|List_Of_RIs
|DOCUMENTATION MISSING
|-
|Is_Type
|DOCUMENTATION MISSING
|-
|Data_View
|Data view filename
|-
......@@ -1019,6 +1013,15 @@ This template is evaluated for every block.
|-
|Shared_Lib_Dir
|Folder hosting the shared component types
|-
|Is_Type
|True if function is a function type
|-
|Instance_Of
|DOCUMENTATION MISSING
|-
|Is_Shared_Type
|True if component is an instance of a function in the shared types folder
|}
......
......@@ -554,13 +554,16 @@ This file is processed for every node. The result of this file indicates if the
|Value of command line flag --target=Target
|-
|CPU_Classifier
|DOCUMENTATION MISSING
|AADL CPU Classifier (e.g. ocarina_processors_x86::x86.linux)
|-
|Shared_Types
|List of available component types
|-
|Shared_Lib_Dir
|Folder hosting the shared component types
|-
|Is_Distributed
|True if the system contains at least one bus
|}
=== templates/concurrency_view/sub/thread.tmplt ===
This file is processed for every thread in every partition in every node.
......@@ -1237,7 +1240,7 @@ This file is evaluated for every node. The result of this file is saved to the f
|DOCUMENTATION MISSING
|-
|CPU_Classifier
|DOCUMENTATION MISSING
|AADL CPU Classifier (e.g. ocarina_processors_x86::x86.linux)
|-
|CPU_Name
|DOCUMENTATION MISSING
......@@ -1301,31 +1304,31 @@ filesys.tmplt.
|Vector Tag of node names
|-
|Node_CPU
|Corresponding CPU name (eg x86_linux)
| -> Corresponding CPU name (eg x86_linux)
|-
|Node_CPU_Classifier
|CPU Classifier (ocarina...::x86_linux)
| -> Corresponding CPU Classifier (ocarina...::x86_linux)
|-
|Node_Major_Frame
|Time in milliseconds allocated to the CPU (TSP only)
| -> Corresponding Time in milliseconds allocated to the CPU (TSP only)
|-
|Partition_Names
|Vector Tag of partition names
|-
|Partition_Node
|Corresponding node name
| -> Corresponding node name
|-
|Partition_CPU
|Corresponding CPU name
| -> Corresponding CPU name
|-
|Partition_Duration
|Corresponding time allocation (TSP only)
| -> Corresponding time allocation (TSP only)
|-
|Partition_VP
|Virtual processor binding (TSP only)
| -> Corresponding Virtual processor binding (TSP only)
|-
|Threads
|Code generated for the threads
|Code generated for the threads (from thread.tmplt)
|-
|Thread_Names
|List of all threads in the complete system
......@@ -1337,22 +1340,22 @@ filesys.tmplt.
|Inter-partition connections : partition source name (vector tag)
|-
|Part_Source_Port
| |_ Corresponding port name
| -> Corresponding port name
|-
|Part_Dest_Name
| |_ Corresponding name of the remote partition
| -> Corresponding name of the remote partition
|-
|Part_Dest_Port
| |_ Corresponding name of the port on the remote partition
| -> Corresponding name of the port on the remote partition
|-
|Bus_Names
|Vector tag: busses present in the system
|-
|Bus_AADL_Package
| |_ corresponding AADL Package
| -> Corresponding AADL Package
|-
|Bus_Classifier
| |_ corresponding AADL classifier
| -> Corresponding AADL classifier
|-
|Device_Node_Name
|
......
......@@ -724,7 +724,9 @@ package body TASTE.Concurrency_View is
.CPU_Platform'Img)
& Assoc ("CPU_Classifier",
CV.Nodes (Node_Name).Deployment_Node
.CPU_Classifier);
.CPU_Classifier)
& Assoc ("Is_Distributed",
CV.Deployment.Busses.Length > 0);
Trigger : constant Boolean :=
(Node_Name /= "interfaceview"
......
Generate main.aadl, which is the entry point for Ocarina
Generate main.aadl, which is the entry point for Ocarina (scenario file)
Contains both POHIC and POHIAda variations
@@-- 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)
@@-- 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
@@-- 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)
@@-- 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
@@-- Specify the file name for the complete system (including nodes)
@@-- (no template tag)
@@-- Generate the scenario file for Ocarina
main.aadl
@@-- 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
@@-- 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
@@-- 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)
@@-- 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
@@-- 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
@@-- The up to date list of tags available for this template is available here:
@@-- https://taste.tuxfamily.org/wiki/index.php?title=Kazoo_Templates_Documentation#templates.2Fconcurrency_view.2Fsub.2Fsystem.tmplt
@@-- If you are using vim, go over the URL and pres gx in to follow the link
@@--
@@-- 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
@@-- @_Used_Shared_Types_@ : List of actually used shared types
@@-- 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
-- Scnenario file for Ocarina used to generate PolyORB-HI code
-- Syntax for manual use: ocarina -x main.aadl
-- This file was generated automatically by taste/kazoo - do not edit
system Taste
properties
Ocarina_Config::AADL_Files =>
......
@@-- 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_@
@@-- 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
TRUE
......@@ -6,6 +6,6 @@
@@-- Use_POHIC
@@-- Debug
@@-- No_Stdlib
@@IF@@ @_Use_POHIC_@ and @_CPU_Platform_@ /= PLATFORM_MSP430_FREERTOS
@@IF@@ @_Use_POHIC_@ and @_CPU_Platform_@ = PLATFORM_AIR
TRUE
@@END_IF@@
......@@ -6,6 +6,6 @@
@@-- Use_POHIC
@@-- Debug
@@-- No_Stdlib
@@IF@@ @_Use_POHIC_@ and @_CPU_Platform_@ /= PLATFORM_MSP430_FREERTOS
@@IF@@ @_Use_POHIC_@ and @_CPU_Platform_@ = PLATFORM_AIR
TRUE
@@END_IF@@
......@@ -6,6 +6,6 @@
@@-- Use_POHIC
@@-- Debug
@@-- No_Stdlib
@@IF@@ @_Use_POHIC_@ and @_CPU_Platform_@ /= PLATFORM_MSP430_FREERTOS
@@IF@@ @_Use_POHIC_@ and @_CPU_Platform_@ = PLATFORM_AIR
TRUE
@@END_IF@@
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment