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

Don't use a matrix tag

parent 46922519
......@@ -81,22 +81,20 @@ package body TASTE.Concurrency_View is
function To_Template (T : AADL_Thread) return Translate_Set is
Remote_Thread : Vector_Tag;
Remote_PI : Vector_Tag;
Ports_Matrix : Matrix_Tag;
begin
for Out_Port of T.Output_Ports loop
Remote_Thread := Remote_Thread & To_String (Out_Port.Remote_Thread);
Remote_PI := Remote_PI & To_String (Out_Port.Remote_PI);
end loop;
Ports_Matrix := +Remote_Thread & Remote_PI;
return Result : constant Translate_Set :=
(+Assoc ("Name", To_String (T.Name))
& Assoc ("Entry_Port_Name", To_String (T.Entry_Port_Name))
& Assoc ("Pro_Block_Name", To_String (T.Protected_Block_Name))
& Assoc ("Node_Name", To_String (T.Node.Value_Or
(Taste_Node'(Name => US (""), others => <>)).Name))
& Assoc ("Out_Ports", Ports_Matrix));
& Assoc ("Remote_Threads", Remote_Thread)
& Assoc ("Remote_PIs", Remote_PI));
end To_Template;
function Concurrency_View_Template (CV : Taste_Concurrency_View)
......
......@@ -4,7 +4,8 @@
@@-- @_Entry_Port_Name_@ : Name of the PI
@@-- @_Pro_Block_Name_@ : Name of the protected function
@@-- @_Node_Name_@ : Name of the deployment node
@@-- @_Out_Ports_@ : Matrix of output ports
@@-- @_Remote_Threads_@ : Vector tag: output remote thread list
@@-- @_Remote_PIs_@ : |_ Associated PI Name
@@--
@@-- Matrix of output ports: Remote thread/corresponding remote PI
Thread : @_Name_@
......@@ -13,8 +14,5 @@ Thread : @_Name_@
|_ Node : @_Node_Name_@
|_ Out_Ports :
@@TABLE@@
Out port:
@@TABLE@@
@_Out_Ports_@
@@END_TABLE@@
@_Remote_Threads_@ -> @_Remote_PIs_@
@@END_TABLE@@
......@@ -74,6 +74,6 @@ PROPERTIES
Taste::coordinates => "0 0 297000 210000";
Taste::version => "2.0";
Taste::interfaceView => "InterfaceView.aadl";
Taste::HWLibraries => ("../../../tool-inst/share/ocarina/AADLv2/ocarina_components.aadl");
Taste::HWLibraries => ("/home/taste/tool-inst/share/ocarina/AADLv2/ocarina_components.aadl");
END deploymentview::DV;
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