Commit 87ee57b1 authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Add reference to deployment view in AST of CV

parent 033f523a
......@@ -353,6 +353,7 @@ package body TASTE.AADL_Parser is
CV : Taste_Concurrency_View :=
(Base_Template_Path => Model.Configuration.Binary_Path,
Base_Output_Path => Model.Configuration.Output_Dir,
Deployment => Model.Deployment_View,
others => <>);
-- Initialize the lists of nodes and partitions based on the DV
......@@ -261,14 +261,23 @@ package body TASTE.Concurrency_View is
end loop;
End_Search (ST);
end Generate_Node;
procedure Generate_System (CV : Taste_Concurrency_View) is
end Generate_System;
procedure Generate_CV (CV : Taste_Concurrency_View) is
-- In this first iteration Nodes are generated in standalone files,
-- and they include their processes. It would be useful to be able
-- to decide if processes could also have their own files, since
-- in the future they may be more than one process per node (for TSP).
for Node in CV.Nodes.Iterate loop
if CV_Nodes.Key (Node) /= "interfaceview" then
CV.Generate_Node (CV_Nodes.Key (Node));
end if;
end loop;
when Error : Concurrency_View_Error | Ada.IO_Exceptions.Name_Error =>
Put_Error ("Concurrency View : "
......@@ -78,7 +78,7 @@ package TASTE.Concurrency_View is
type CV_Partition is tagged
Deployment_Partition : aliased Taste_Partition;
Deployment_Partition : Taste_Partition;
Threads : AADL_Threads.Map;
Blocks : Protected_Blocks.Map;
end record;
......@@ -88,7 +88,7 @@ package TASTE.Concurrency_View is
-- A node may contain several partitions (in case of TSP)
type CV_Node is tagged
Deployment_Node : aliased Taste_Node;
Deployment_Node : Taste_Node;
Partitions : CV_Partitions.Map;
end record;
......@@ -102,6 +102,7 @@ package TASTE.Concurrency_View is
type Taste_Concurrency_View is tagged
Nodes : CV_Nodes.Map;
Deployment : Complete_Deployment_View;
Base_Template_Path : String_Holder;
Base_Output_Path : String_Holder;
end record;
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