Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
kazoo
Commits
b98b697d
Commit
b98b697d
authored
Sep 18, 2019
by
Maxime Perrotin
Browse files
Use a protected interface to avoid race conditions
(How the hell could it work before?...)
parent
1b9a10eb
Changes
4
Hide whitespace changes
Inline
Side-by-side
test/Demo_Blackbox/DeploymentView.aadl
View file @
b98b697d
...
...
@@ -74,6 +74,6 @@ PROPERTIES
Taste::coordinates => "0 0 2970 2100";
Taste::version => "1.3.17";
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;
test/Demo_Blackbox/InterfaceView.aadl
View file @
b98b697d
...
...
@@ -125,7 +125,7 @@ FEATURES
};
RI_RunDriver : REQUIRES SUBPROGRAM ACCESS interfaceview::FV::BlackBox::PI_RunDriver.others {
Taste::coordinates => "1302 384";
Taste::RCMoperationKind =>
un
protected;
Taste::RCMoperationKind => protected;
Taste::InterfaceName => "RunDriver";
Taste::labelInheritance => "true";
};
...
...
@@ -146,7 +146,7 @@ SYSTEM BlackBox
FEATURES
PI_RunDriver : PROVIDES SUBPROGRAM ACCESS interfaceview::FV::BlackBox::PI_RunDriver.others {
Taste::coordinates => "1872 494";
Taste::RCMoperationKind =>
un
protected;
Taste::RCMoperationKind => protected;
Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms;
Taste::InterfaceName => "RunDriver";
...
...
@@ -175,7 +175,7 @@ FEATURES
};
RI_RunDriver : REQUIRES SUBPROGRAM ACCESS interfaceview::FV::BlackBox::PI_RunDriver.others {
Taste::coordinates => "1338 1189";
Taste::RCMoperationKind =>
un
protected;
Taste::RCMoperationKind => protected;
Taste::InterfaceName => "RunDriver";
Taste::labelInheritance => "true";
};
...
...
test/Demo_Blackbox/caller_in_ada/caller_in_ada.adb
View file @
b98b697d
...
...
@@ -24,6 +24,7 @@ package body caller_in_ada is
---------------------------------------------------------
procedure
pulse
is
begin
System
.
IO
.
Put_Line
(
"[Ada] Calling in Ada"
);
RunDriver
(
i1
,
i2
,
o1
,
o2
);
system
.
io
.
put
(
"[Ada] i1="
);
...
...
test/Demo_Blackbox/caller_in_c/caller_in_c.c
View file @
b98b697d
...
...
@@ -12,6 +12,7 @@ void caller_in_c_PI_pulse()
{
static
asn1SccMyInteger
i1
=
0
,
i2
=
1
,
o1
,
o2
;
printf
(
"[C] Calling in C
\n
"
);
caller_in_c_RI_RunDriver
(
&
i1
,
&
i2
,
&
o1
,
&
o2
);
printf
(
"[C] i1 = %lld, i2 = %lld, o1 = %lld, o2 = %lld"
,
i1
,
i2
,
o1
,
o2
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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