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
f40ad47e
Commit
f40ad47e
authored
Apr 23, 2019
by
Maxime Perrotin
Browse files
Rename Name to Thread_Name to avoid ambiguities
parent
04d19f14
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/taste-concurrency_view.adb
View file @
f40ad47e
...
...
@@ -79,7 +79,7 @@ package body TASTE.Concurrency_View is
-- This function translates a protected block into a template
function
Prepare_Template
(
B
:
Protected_Block
)
return
Block_As_Template
is
Calling_Threads
:
Tag
;
Result
:
Block_As_Template
;
Result
:
Block_As_Template
;
begin
for
Thread
of
B
.
Calling_Threads
loop
Calling_Threads
:=
Calling_Threads
&
Thread
;
...
...
@@ -117,7 +117,7 @@ package body TASTE.Concurrency_View is
end
loop
;
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
(
"RCM"
,
To_String
(
T
.
RCM
))
&
Assoc
(
"Pro_Block_Name"
,
To_String
(
T
.
Protected_Block_Name
))
...
...
templates/concurrency_view/aadl_1_nodes/thread.tmplt
View file @
f40ad47e
@@-- The following tags are available in this template:
@@--
@@-- @_
Name_@
: Thread name
@@-- @_
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
...
...
@@ -9,4 +9,4 @@
@@-- @_Remote_PIs_@ : |_ Associated PI Name
@@--
@@-- Matrix of output ports: Remote thread/corresponding remote PI
@_Name_@
@_
Thread_
Name_@
templates/concurrency_view/aadl_2_threads/thread.tmplt
View file @
f40ad47e
@@--
The
following
tags
are
available
in
this
template
:
@@--
@@--
@
_
Name_
@
:
Thread
name
@@--
@
_
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
...
...
@@ -9,22 +9,22 @@
@@--
@
_Remote_PIs_
@
:
|
_
Associated
PI
Name
@@--
@@--
Matrix
of
output
ports
:
Remote
thread
/
corresponding
remote
PI
@
_Name_
@
package
@
_Name_
@
_Thread
package
@
_
Thread_
Name_
@
_Thread
public
with
Deployment
;
with
process_package
;
with
Dataview
;
thread
@
_Name_
@
thread
@
_
Thread_
Name_
@
features
INPORT_
@
_Entry_Port_Name_
@
:
in
event
<
MISSING
>
port
<
MISSING
>
{
Compute_Execution_Time
=>
<
MISSING
>;
Queue_Size
=>
<
MISSING
>;
Compute_Entrypoint_Source_Text
=>
"@_Name_@_Wrappers.@_Entry_Port_Name_@"
;
};
Compute_Entrypoint_Source_Text
=>
"@_
Thread_
Name_@_Wrappers.@_Entry_Port_Name_@"
;
};
@@
TABLE
@@
OUTPUT_
@
_Remote_PIs_
@
:
out
event
<
MISSING
>
port
<
MISSING
>;
@@
END_TABLE
@@
end
@
_Name_
@;
end
@
_
Thread_
Name_
@;
thread
implementation
@
_Name_
@.
others
properties
...
...
templates/concurrency_view/ada_basic_body/thread.tmplt
View file @
f40ad47e
@@-- The following tags are available in this template:
@@--
@@-- @_Name_@ : Thread name
@@-- @_
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
...
...
@@ -9,7 +9,7 @@
@@-- @_Remote_PIs_@ : |_ Associated PI Name
@@--
@@-- Matrix of output ports: Remote thread/corresponding remote PI
task @_CAPITALIZE:Name_@ is
task @_CAPITALIZE:
Thread_
Name_@ is
Port : @_Entry_Port_Name_@
Protected Block : @_Pro_Block_Name_@
Node : @_Node_Name_@
...
...
@@ -17,4 +17,4 @@ task @_CAPITALIZE:Name_@ is
@@TABLE@@
@_Remote_Threads_@ -> @_Remote_PIs_@
@@END_TABLE@@
end @_CAPITALIZE:Name_@;
end @_CAPITALIZE:
Thread_
Name_@;
templates/concurrency_view/ada_basic_source/thread.tmplt
View file @
f40ad47e
@@-- The following tags are available in this template:
@@--
@@-- @_Name_@ : Thread name
@@-- @_
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
...
...
@@ -10,10 +10,10 @@
@@--
@@-- Matrix of output ports: Remote thread/corresponding remote PI
@@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_@,
Init => @_Pro_Block_Name_@.Init);
use @_CAPITALIZE:Name_@_Package;
use @_CAPITALIZE:
Thread_
Name_@_Package;
@@ELSE@@
-- Sporadic threads are not supported (@_Pro_Block_Name_@.@_Entry_Port_Name_@)
@@END_IF@@
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