Commit f40ad47e authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Rename Name to Thread_Name to avoid ambiguities

parent 04d19f14
...@@ -79,7 +79,7 @@ package body TASTE.Concurrency_View is ...@@ -79,7 +79,7 @@ package body TASTE.Concurrency_View is
-- This function translates a protected block into a template -- This function translates a protected block into a template
function Prepare_Template (B : Protected_Block) return Block_As_Template is function Prepare_Template (B : Protected_Block) return Block_As_Template is
Calling_Threads : Tag; Calling_Threads : Tag;
Result : Block_As_Template; Result : Block_As_Template;
begin begin
for Thread of B.Calling_Threads loop for Thread of B.Calling_Threads loop
Calling_Threads := Calling_Threads & Thread; Calling_Threads := Calling_Threads & Thread;
...@@ -117,7 +117,7 @@ package body TASTE.Concurrency_View is ...@@ -117,7 +117,7 @@ package body TASTE.Concurrency_View is
end loop; end loop;
return Result : constant Translate_Set := return Result : constant Translate_Set :=
(+Assoc ("Name", To_String (T.Name)) (+Assoc ("Thread_Name", To_String (T.Name))
& Assoc ("Entry_Port_Name", To_String (T.Entry_Port_Name)) & Assoc ("Entry_Port_Name", To_String (T.Entry_Port_Name))
& Assoc ("RCM", To_String (T.RCM)) & Assoc ("RCM", To_String (T.RCM))
& Assoc ("Pro_Block_Name", To_String (T.Protected_Block_Name)) & Assoc ("Pro_Block_Name", To_String (T.Protected_Block_Name))
......
@@-- The following tags are available in this template: @@-- The following tags are available in this template:
@@-- @@--
@@-- @_Name_@ : Thread name @@-- @_Thread_Name_@ : Thread name
@@-- @_Entry_Port_Name_@ : Name of the PI @@-- @_Entry_Port_Name_@ : Name of the PI
@@-- @_RCM_@ : One of "CYCLIC_OPERATION", "SPORADIC_OPERATION" @@-- @_RCM_@ : One of "CYCLIC_OPERATION", "SPORADIC_OPERATION"
@@-- @_Pro_Block_Name_@ : Name of the protected function @@-- @_Pro_Block_Name_@ : Name of the protected function
...@@ -9,4 +9,4 @@ ...@@ -9,4 +9,4 @@
@@-- @_Remote_PIs_@ : |_ Associated PI Name @@-- @_Remote_PIs_@ : |_ Associated PI Name
@@-- @@--
@@-- Matrix of output ports: Remote thread/corresponding remote PI @@-- Matrix of output ports: Remote thread/corresponding remote PI
@_Name_@ @_Thread_Name_@
@@-- The following tags are available in this template: @@-- The following tags are available in this template:
@@-- @@--
@@-- @_Name_@ : Thread name @@-- @_Thread_Name_@ : Thread name
@@-- @_Entry_Port_Name_@ : Name of the PI @@-- @_Entry_Port_Name_@ : Name of the PI
@@-- @_RCM_@ : One of "CYCLIC_OPERATION", "SPORADIC_OPERATION" @@-- @_RCM_@ : One of "CYCLIC_OPERATION", "SPORADIC_OPERATION"
@@-- @_Pro_Block_Name_@ : Name of the protected function @@-- @_Pro_Block_Name_@ : Name of the protected function
...@@ -9,22 +9,22 @@ ...@@ -9,22 +9,22 @@
@@-- @_Remote_PIs_@ : |_ Associated PI Name @@-- @_Remote_PIs_@ : |_ Associated PI Name
@@-- @@--
@@-- Matrix of output ports: Remote thread/corresponding remote PI @_Name_@ @@-- Matrix of output ports: Remote thread/corresponding remote PI @_Name_@
package @_Name_@_Thread package @_Thread_Name_@_Thread
public public
with Deployment; with Deployment;
with process_package; with process_package;
with Dataview; with Dataview;
thread @_Name_@ thread @_Thread_Name_@
features features
INPORT_@_Entry_Port_Name_@ : in event <MISSING> port <MISSING> INPORT_@_Entry_Port_Name_@ : in event <MISSING> port <MISSING>
{ Compute_Execution_Time => <MISSING>; { Compute_Execution_Time => <MISSING>;
Queue_Size => <MISSING>; Queue_Size => <MISSING>;
Compute_Entrypoint_Source_Text => "@_Name_@_Wrappers.@_Entry_Port_Name_@"; }; Compute_Entrypoint_Source_Text => "@_Thread_Name_@_Wrappers.@_Entry_Port_Name_@"; };
@@TABLE@@ @@TABLE@@
OUTPUT_@_Remote_PIs_@ : out event <MISSING> port <MISSING>; OUTPUT_@_Remote_PIs_@ : out event <MISSING> port <MISSING>;
@@END_TABLE@@ @@END_TABLE@@
end @_Name_@; end @_Thread_Name_@;
thread implementation @_Name_@.others thread implementation @_Name_@.others
properties properties
......
@@-- The following tags are available in this template: @@-- The following tags are available in this template:
@@-- @@--
@@-- @_Name_@ : Thread name @@-- @_Thread_Name_@ : Thread name
@@-- @_Entry_Port_Name_@ : Name of the PI @@-- @_Entry_Port_Name_@ : Name of the PI
@@-- @_RCM_@ : One of "CYCLIC_OPERATION", "SPORADIC_OPERATION" @@-- @_RCM_@ : One of "CYCLIC_OPERATION", "SPORADIC_OPERATION"
@@-- @_Pro_Block_Name_@ : Name of the protected function @@-- @_Pro_Block_Name_@ : Name of the protected function
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
@@-- @_Remote_PIs_@ : |_ Associated PI Name @@-- @_Remote_PIs_@ : |_ Associated PI Name
@@-- @@--
@@-- Matrix of output ports: Remote thread/corresponding remote PI @@-- Matrix of output ports: Remote thread/corresponding remote PI
task @_CAPITALIZE:Name_@ is task @_CAPITALIZE:Thread_Name_@ is
Port : @_Entry_Port_Name_@ Port : @_Entry_Port_Name_@
Protected Block : @_Pro_Block_Name_@ Protected Block : @_Pro_Block_Name_@
Node : @_Node_Name_@ Node : @_Node_Name_@
...@@ -17,4 +17,4 @@ task @_CAPITALIZE:Name_@ is ...@@ -17,4 +17,4 @@ task @_CAPITALIZE:Name_@ is
@@TABLE@@ @@TABLE@@
@_Remote_Threads_@ -> @_Remote_PIs_@ @_Remote_Threads_@ -> @_Remote_PIs_@
@@END_TABLE@@ @@END_TABLE@@
end @_CAPITALIZE:Name_@; end @_CAPITALIZE:Thread_Name_@;
@@-- The following tags are available in this template: @@-- The following tags are available in this template:
@@-- @@--
@@-- @_Name_@ : Thread name @@-- @_Thread_Name_@ : Thread name
@@-- @_Entry_Port_Name_@ : Name of the PI @@-- @_Entry_Port_Name_@ : Name of the PI
@@-- @_RCM_@ : One of "CYCLIC_OPERATION", "SPORADIC_OPERATION" @@-- @_RCM_@ : One of "CYCLIC_OPERATION", "SPORADIC_OPERATION"
@@-- @_Pro_Block_Name_@ : Name of the protected function @@-- @_Pro_Block_Name_@ : Name of the protected function
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
@@-- @@--
@@-- Matrix of output ports: Remote thread/corresponding remote PI @@-- Matrix of output ports: Remote thread/corresponding remote PI
@@IF@@ @_RCM_@ = "CYCLIC_OPERATION" @@IF@@ @_RCM_@ = "CYCLIC_OPERATION"
@_CAPITALIZE:Name_@_Package is new Periodic_Task @_CAPITALIZE:Thread_Name_@_Package is new Periodic_Task
(Cyclic_Operation => @_Pro_Block_Name_@.@_Entry_Port_Name_@, (Cyclic_Operation => @_Pro_Block_Name_@.@_Entry_Port_Name_@,
Init => @_Pro_Block_Name_@.Init); Init => @_Pro_Block_Name_@.Init);
use @_CAPITALIZE:Name_@_Package; use @_CAPITALIZE:Thread_Name_@_Package;
@@ELSE@@ @@ELSE@@
-- Sporadic threads are not supported (@_Pro_Block_Name_@.@_Entry_Port_Name_@) -- Sporadic threads are not supported (@_Pro_Block_Name_@.@_Entry_Port_Name_@)
@@END_IF@@ @@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