Commit f3593584 authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Merge branch 'feature_buster' of https://gitrepos.estec.esa.int/taste/kazoo into feature_buster

parents 54382685 e2c9dbbe
......@@ -13,11 +13,6 @@ with GSER;
package body Properties is
procedure Check_Queue (Res : out asn1Boolean) is
begin
Res := False;
end Check_Queue;
procedure Update_State (Full_State : in out State_With_Observers;
Application_State : asn1SccSystem_State) is
begin
......
......@@ -36,10 +36,6 @@ package Properties is
(User_State => asn1sccSystem_State_Init,
My_Observer_State => My_Observer.Ctxt);
-- there are continuous signals in the observers, we need check_queue
procedure Check_Queue (Res : out asn1Boolean);
pragma Export (C, Check_Queue, "my_observer_check_queue");
procedure My_Properties (Full_State : in out State_With_Observers;
Event : in out asn1sccObservable_Event;
Id : out Natural;
......
system my_observer;
/* CIF TEXT (147, 178), (280, 136) */
/* CIF TEXT (147, 177), (432, 136) */
use datamodel comment 'observer.asn';
exported procedure observe;
......@@ -27,7 +27,7 @@ observe;
dcl count T_Int renames st.orchestrator.counter;
/* CIF ENDTEXT */
/* CIF procedure (1255, 63), (70, 35) */
/* CIF procedure (1254, 63), (70, 35) */
procedure observe;
/* CIF TEXT (38, 48), (313, 120) */
-- this procedure could be generated automatically,
......@@ -35,14 +35,13 @@ observe;
fpar in/out model System_State,
in/out last_event Observable_Event;
/* CIF ENDTEXT */
/* CIF START (362, 153), (70, 35) */
START;
/* CIF task (330, 208), (134, 40) */
/* CIF task (328, 208), (137, 40) */
task st := model,
event := last_event;
/* CIF return (380, 268), (35, 35) */
Event := Last_Event;
/* CIF return (379, 268), (35, 35) */
return ;
endprocedure;
/* CIF START (433, 78), (70, 35) */
......@@ -51,16 +50,19 @@ event := last_event;
call writeln ('observer init');
/* CIF NEXTSTATE (426, 183), (83, 35) */
NEXTSTATE first_state;
/* CIF state (426, 183), (83, 35) */
state first_state;
/* CIF provided (425, 239), (85, 35) */
provided count;
/* CIF PROCEDURECALL (317, 294), (300, 35) */
call writeln ('[observer] step 1 passed (counter=3)');
/* CIF NEXTSTATE (417, 349), (101, 35) */
NEXTSTATE second_state;
/* CIF state (1013, 111), (101, 35) */
state second_state;
/* CIF provided (963, 168), (241, 35) */
provided st.orchestrator.magic_number = 42;
/* CIF PROCEDURECALL (904, 223), (359, 35) */
call writeln ('[observer] step 2 passed (magic_number =42)');
/* CIF NEXTSTATE (1033, 273), (101, 35) */
NEXTSTATE third_state;
endstate;
/* CIF state (116, 218), (95, 35) */
state end_success;
endstate;
/* CIF state (1138, 316), (88, 35) */
/* CIF state (1137, 316), (88, 35) */
state third_state;
/* CIF provided (1104, 371), (341, 136) */
provided event =
......@@ -74,35 +76,31 @@ priority 2;
call writeln ('SUCCESS(1)');
/* CIF NEXTSTATE (1226, 593), (95, 35) */
NEXTSTATE end_success;
/* CIF provided (527, 371), (525, 104) */
/* CIF provided (526, 371), (525, 104) */
provided present(event) = output_event
and then event.output_event.dest = simulator_gui
and then present(event.output_event.event) = orchestrator
and then present(event.output_event.event.orchestrator.msg_out) = paramesstogui;
priority 3;
/* CIF PROCEDURECALL (702, 506), (176, 35) */
/* CIF PROCEDURECALL (701, 506), (176, 35) */
call writeln ('SUCCESS(2)');
/* CIF NEXTSTATE (742, 561), (95, 35) */
/* CIF NEXTSTATE (741, 561), (95, 35) */
NEXTSTATE end_success;
/* CIF provided (1495, 371), (173, 72) */
provided output paramesstogui
from orchestrator;
priority 1;
/* CIF NEXTSTATE (1534, 474), (95, 40) */
/* CIF NEXTSTATE (1533, 474), (95, 40) */
NEXTSTATE end_success;
endstate;
/* CIF state (117, 218), (95, 35) */
state end_success;
endstate;
/* CIF state (1014, 111), (101, 35) */
state second_state;
/* CIF provided (963, 168), (241, 35) */
provided st.orchestrator.magic_number = 42;
/* CIF PROCEDURECALL (904, 223), (359, 35) */
call writeln ('[observer] step 2 passed (magic_number =42)');
/* CIF NEXTSTATE (1033, 273), (101, 35) */
NEXTSTATE third_state;
/* CIF state (426, 183), (83, 35) */
state first_state;
/* CIF provided (425, 239), (85, 35) */
provided count;
/* CIF PROCEDURECALL (317, 294), (300, 35) */
call writeln ('[observer] step 1 passed (counter=3)');
/* CIF NEXTSTATE (416, 349), (101, 35) */
NEXTSTATE second_state;
endstate;
endprocess my_observer;
endblock;
......
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