Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
kazoo
Commits
c01e3bf4
Commit
c01e3bf4
authored
Aug 19, 2019
by
Maxime Perrotin
Browse files
Add busses to system.aadl
parent
840a1f4c
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/taste-concurrency_view.adb
View file @
c01e3bf4
...
@@ -521,7 +521,20 @@ package body TASTE.Concurrency_View is
...
@@ -521,7 +521,20 @@ package body TASTE.Concurrency_View is
Part_Source_Name
,
Part_Source_Name
,
Part_Source_Port
,
Part_Source_Port
,
Part_Dest_Name
:
Vector_Tag
;
-- Inter-partition connections (TSP)
Part_Dest_Name
:
Vector_Tag
;
-- Inter-partition connections (TSP)
Bus_Names
,
Bus_AADL_Pkg
,
Bus_Classifier
:
Vector_Tag
;
-- System busses
begin
begin
-- Prepare the template tags of system.aadl with the busses
for
Bus
of
CV
.
Deployment
.
Busses
loop
-- The bus user properties are ignored here
-- Could be added if needed but they would require an
-- additional template file to process the name/values.
Bus_Names
:=
Bus_Names
&
Bus
.
Name
;
Bus_AADL_Pkg
:=
Bus_AADL_Pkg
&
Bus
.
AADL_Package
;
Bus_Classifier
:=
Bus_Classifier
&
Bus
.
Classifier
;
end
loop
;
for
Node
in
CV
.
Nodes
.
Iterate
loop
for
Node
in
CV
.
Nodes
.
Iterate
loop
declare
declare
Node_Name
:
constant
String
:=
CV_Nodes
.
Key
(
Node
);
Node_Name
:
constant
String
:=
CV_Nodes
.
Key
(
Node
);
...
@@ -632,7 +645,10 @@ package body TASTE.Concurrency_View is
...
@@ -632,7 +645,10 @@ package body TASTE.Concurrency_View is
&
Assoc
(
"Threads"
,
Threads
)
&
Assoc
(
"Threads"
,
Threads
)
&
Assoc
(
"Thread_Names"
,
All_Thread_Names
)
&
Assoc
(
"Thread_Names"
,
All_Thread_Names
)
&
Assoc
(
"Block_Names"
,
All_Block_Names
)
&
Assoc
(
"Block_Names"
,
All_Block_Names
)
&
Assoc
(
"Target_Packages"
,
All_Target_Names
);
&
Assoc
(
"Target_Packages"
,
All_Target_Names
)
&
Assoc
(
"Bus_Names"
,
Bus_Names
)
&
Assoc
(
"Bus_AADL_Package"
,
Bus_AADL_Pkg
)
&
Assoc
(
"Bus_Classifier"
,
Bus_Classifier
);
Create_Path
(
CV_Out_Dir
);
Create_Path
(
CV_Out_Dir
);
Create
(
File
=>
Output_File
,
Create
(
File
=>
Output_File
,
Mode
=>
Out_File
,
Mode
=>
Out_File
,
...
...
templates/concurrency_view/aadl_4_makefile/system.tmplt
View file @
c01e3bf4
...
@@ -11,6 +11,9 @@
...
@@ -11,6 +11,9 @@
@@-- @_Thread_Names_@ : List of all threads in the complete system
@@-- @_Thread_Names_@ : List of all threads in the complete system
@@-- @_Block_Names_@ : List of all blocks in the complete system
@@-- @_Block_Names_@ : List of all blocks in the complete system
@@-- @_Target_Packages_@ : List of all target package names in the complete system
@@-- @_Target_Packages_@ : List of all target package names in the complete system
@@-- @_Bus_Names_@ : Vector tag: busses present in the system
@@-- @_Bus_AADL_Package_@ : |_ corresponding AADL Package
@@-- @_Bus_Classifier_@ : |_ corresponding AADL classifier
@@-- And all the system configuration obtained from the command line:
@@-- And all the system configuration obtained from the command line:
@@-- Interface_View, Deployment_View, Data_View, Binary_Path, Check_Data_View,
@@-- Interface_View, Deployment_View, Data_View, Binary_Path, Check_Data_View,
@@-- Output_Dir, Skeletons, Glue, Use_POHIC, Timer_Resolution, Debug_Flag,
@@-- Output_Dir, Skeletons, Glue, Use_POHIC, Timer_Resolution, Debug_Flag,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment