Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
OpenGEODE
Commits
c0c8ecd9
Commit
c0c8ecd9
authored
Nov 01, 2015
by
Maxime Perrotin
Browse files
Add state composition to test-simu
parent
ec98902b
Changes
2
Hide whitespace changes
Inline
Side-by-side
tests/regression/test-simu/orchestrator.pr
View file @
c0c8ecd9
...
...
@@ -2,6 +2,27 @@
PROCESS orchestrator
/* CIF COMMENT (407, 195), (78, 35) */
COMMENT 'Hello';
STATE wait;
SUBSTRUCTURE
/* CIF START (116, 38), (70, 35) */
START;
/* CIF NEXTSTATE (88, 88), (124, 35) */
NEXTSTATE entering_wait;
/* CIF STATE (83, 193), (134, 35) */
STATE waiting_in_wait;
/* CIF INPUT (114, 248), (73, 35) */
INPUT other;
/* CIF NEXTSTATE (83, 298), (134, 35) */
NEXTSTATE entering_wait;
ENDSTATE;
/* CIF STATE (88, 88), (124, 35) */
STATE entering_wait;
/* CIF INPUT (114, 143), (73, 35) */
INPUT other;
/* CIF NEXTSTATE (83, 193), (134, 35) */
NEXTSTATE waiting_in_wait;
ENDSTATE;
ENDSUBSTRUCTURE;
/* CIF TEXT (0, 138), (448, 448) */
dcl seq tastE_Peek_id_list := { 1,2,3,4,5};
...
...
@@ -34,7 +55,7 @@ external comment '#vdm #classname=RemoteCall';
STATE next;
/* CIF INPUT (1643, 400), (122, 35) */
INPUT pulse(a);
/* CIF PROCEDURECALL (159
8
, 450), (213, 35) */
/* CIF PROCEDURECALL (159
7
, 450), (213, 35) */
CALL reset_timer(mytimer);
/* CIF NEXTSTATE (1669, 500), (70, 35) */
NEXTSTATE wait;
...
...
@@ -45,65 +66,65 @@ external comment '#vdm #classname=RemoteCall';
INPUT Paramless_TC;
/* CIF PROCEDURECALL (1598, 230), (249, 35) */
CALL SET_timer(1000, mytimer);
/* CIF NEXTSTATE (168
6
, 280), (74, 35) */
/* CIF NEXTSTATE (168
5
, 280), (74, 35) */
NEXTSTATE next;
ENDSTATE;
/* CIF STATE (1085, 201), (72, 34) */
STATE Wait;
/* CIF INPUT (
80
7, 255), (101, 35) */
/* CIF INPUT (
79
7, 255), (101, 35) */
INPUT pulse(a);
/* CIF TASK (7
7
2, 305), (170, 48) */
/* CIF TASK (7
6
2, 305), (170, 48) */
TASK seq := {0,1,0,1,0},
anint := 478;
/* CIF PROCEDURECALL (7
2
8, 368), (259, 35) */
/* CIF PROCEDURECALL (7
1
8, 368), (259, 35) */
CALL writeln('Input param', anint);
/* CIF PROCEDURECALL (7
3
8, 418), (238, 35) */
/* CIF PROCEDURECALL (7
2
8, 418), (238, 35) */
CALL ExternalProc(anint, anint);
/* CIF PROCEDURECALL (7
2
0, 468), (275, 35) */
/* CIF PROCEDURECALL (7
1
0, 468), (275, 35) */
CALL writeln('Output param', anint);
/* CIF PROCEDURECALL (7
1
4, 518), (286, 35) */
/* CIF PROCEDURECALL (7
0
4, 518), (286, 35) */
CALL write('Calling VDM with data');
/* CIF TASK (6
6
4, 568), (386, 48) */
/* CIF TASK (6
5
4, 568), (386, 48) */
TASK for each in fixed: call write(each, ' '); endfor;
/* CIF PROCEDURECALL (7
7
2, 631), (170, 40) */
/* CIF PROCEDURECALL (7
6
2, 631), (170, 40) */
CALL writeln('');
/* CIF PROCEDURECALL (7
7
1, 686), (172, 35) */
/* CIF PROCEDURECALL (7
6
1, 686), (172, 35) */
CALL vdm(fixed, fixed);
/* CIF PROCEDURECALL (7
7
2, 736), (170, 40) */
/* CIF PROCEDURECALL (7
6
2, 736), (170, 40) */
CALL write('Result:');
/* CIF TASK (6
6
6, 791), (383, 35) */
/* CIF TASK (6
5
6, 791), (383, 35) */
TASK for each in fixed: call write(each, ' '); endfor;
/* CIF PROCEDURECALL (7
9
9, 841), (116, 40) */
/* CIF PROCEDURECALL (7
8
9, 841), (116, 40) */
CALL writeln('');
/* CIF PROCEDURECALL (6
6
7, 896), (381, 35) */
/* CIF PROCEDURECALL (6
5
7, 896), (381, 35) */
CALL writeln('Calling VDM2 with value', fixed(0));
/* CIF PROCEDURECALL (7
3
6, 946), (242, 35) */
/* CIF PROCEDURECALL (7
2
6, 946), (242, 35) */
CALL vdm2(fixed(0), simpleseq);
/* CIF PROCEDURECALL (
60
2, 996), (511, 40) */
/* CIF PROCEDURECALL (
59
2, 996), (511, 40) */
CALL writeln('Result:', simpleseq!a, ' ', simpleseq!b, ' ', simpleseq!c);
/* CIF OUTPUT (7
8
8, 1051), (138, 35) */
/* CIF OUTPUT (7
7
8, 1051), (138, 35) */
OUTPUT telemetry(a);
/* CIF OUTPUT (7
8
4, 1101), (147, 35) */
/* CIF OUTPUT (7
7
4, 1101), (147, 35) */
OUTPUT peek_list(seq);
/* CIF OUTPUT (7
6
9, 1151), (177, 35) */
/* CIF OUTPUT (7
5
9, 1151), (177, 35) */
OUTPUT peek_fixed(fixed);
/* CIF NEXTSTATE (8
2
0, 1201), (74, 35) */
/* CIF NEXTSTATE (8
1
0, 1201), (74, 35) */
NEXTSTATE next;
/* CIF INPUT (12
1
9, 255), (147, 35) */
/* CIF INPUT (12
0
9, 255), (147, 35) */
INPUT Paramless_TC;
/* CIF PROCEDURECALL (11
6
6, 305), (253, 35) */
/* CIF PROCEDURECALL (11
5
6, 305), (253, 35) */
CALL writeln('Got Paramless TC');
/* CIF PROCEDURECALL (11
6
8, 355), (249, 35) */
/* CIF PROCEDURECALL (11
5
8, 355), (249, 35) */
CALL SET_timer(1000, mytimer);
/* CIF OUTPUT (12
1
7, 405), (150, 35) */
/* CIF OUTPUT (12
0
7, 405), (150, 35) */
OUTPUT Paramless_TM;
/* CIF TASK (11
9
1, 455), (202, 35) */
/* CIF TASK (11
8
1, 455), (202, 35) */
TASK anint := (anint + 1) mod 100;
/* CIF NEXTSTATE (12
5
7, 505), (70, 35) */
/* CIF NEXTSTATE (12
4
7, 505), (70, 35) */
NEXTSTATE wait;
/* CIF INPUT (14
2
9, 255), (104, 35) */
/* CIF INPUT (14
1
9, 255), (104, 35) */
INPUT mytimer;
/* CIF NEXTSTATE (14
3
0, 305), (102, 35) */
/* CIF NEXTSTATE (14
2
0, 305), (102, 35) */
NEXTSTATE Timeout;
ENDSTATE;
ENDPROCESS orchestrator;
\ No newline at end of file
tests/regression/test-simu/system_structure.pr
View file @
c0c8ecd9
...
...
@@ -9,6 +9,7 @@ SYSTEM orchestrator;
SIGNAL peek_fixed(fixedintlist);
SIGNAL Paramless_TC;
SIGNAL Paramless_TM;
signal other;
PROCEDURE ExternalProc;
FPAR
...
...
@@ -17,14 +18,14 @@ SYSTEM orchestrator;
EXTERNAL;
CHANNEL c
FROM ENV TO orchestrator WITH pulse, Paramless_TC;
FROM ENV TO orchestrator WITH pulse, Paramless_TC
, other
;
FROM orchestrator TO ENV WITH telemetry, peek_list, peek_fixed, Paramless_TM;
ENDCHANNEL;
BLOCK orchestrator;
SIGNALROUTE r
FROM ENV TO orchestrator WITH pulse, Paramless_TC;
FROM ENV TO orchestrator WITH pulse, Paramless_TC
, other
;
FROM orchestrator TO ENV WITH telemetry, peek_list, peek_fixed, Paramless_TM;
CONNECT c and r;
...
...
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