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

Add parameterless GUI interfaces

parent 44f70e06
--------------------------------------------------------
-- type dataview
---------------------------------------
--! File generated by asn2aadl v2.2-r90f76d6: DO NOT EDIT !
--------------------------------------------------------
--! MadeInFastMode:True:
--! InputASN1FileChecksum:ee8a7e01f29874c0d50f437d5abb9599:/home/taste/tool-inst/share/taste-types/taste-types.asn:
--! InputASN1FileChecksum:d35c842af091eb390ec95d70226b5315:DataView.acn:
--! InputASN1FileChecksum:4a6456798eeed65949ae3a868977379d:DataView.asn:
--! InputASN1FileChecksum:48c0a111d212af65abc8c413f15ad1d9:DataView.asn:
--------------------------------------------------------
package DataView
......@@ -85,13 +85,12 @@ DATA T_Int
PROPERTIES
-- name of the ASN.1 source file:
Source_Text => ("DataView.asn");
TASTE::EncodingDefinitionFile => classifier(DataView::ACN_Iterators_Types);
TASTE::Ada_Package_Name => "Iterators_Types";
Deployment::ASN1_Module_Name => "Iterators-Types";
Source_Language => (ASN1);
-- name of the corresponding data type in the source file:
Type_Source_Name => "T-Int";
TASTE::Position_In_File => [ line => 4 ; column => 1 ; ];
TASTE::Position_In_File => [ line => 6 ; column => 1 ; ];
-- what kind of type is this?
TASTE::ASN1_Basic_Type =>aINTEGER;
END T_Int;
......@@ -199,17 +198,55 @@ PROPERTIES
Data_Model::Data_Representation => Struct;
END T_Int8_Buffer.impl;
DATA T_Null
PROPERTIES
-- name of the ASN.1 source file:
Source_Text => ("DataView.asn");
TASTE::Ada_Package_Name => "Iterators_Types";
Deployment::ASN1_Module_Name => "Iterators-Types";
Source_Language => (ASN1);
-- name of the corresponding data type in the source file:
Type_Source_Name => "T-Null";
TASTE::Position_In_File => [ line => 4 ; column => 1 ; ];
-- what kind of type is this?
TASTE::ASN1_Basic_Type =>aSEQUENCE;
END T_Null;
DATA IMPLEMENTATION T_Null.impl
END T_Null.impl;
DATA T_Null_Buffer_Max
END T_Null_Buffer_Max;
DATA IMPLEMENTATION T_Null_Buffer_Max.impl
-- Buffer to hold a marshalled data of type T_Null
PROPERTIES
Data_Model::Data_Representation => array;
Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
END T_Null_Buffer_Max.impl;
DATA T_Null_Buffer
END T_Null_Buffer;
DATA IMPLEMENTATION T_Null_Buffer.impl
-- Buffer to hold a marshalled data of type T_Null
SUBCOMPONENTS
Buffer : data T_Null_Buffer_Max.impl;
Length : data Base_Types::Unsigned_32;
PROPERTIES
Data_Model::Data_Representation => Struct;
END T_Null_Buffer.impl;
DATA T_SeqOf
PROPERTIES
-- name of the ASN.1 source file:
Source_Text => ("DataView.asn");
TASTE::EncodingDefinitionFile => classifier(DataView::ACN_Iterators_Types);
TASTE::Ada_Package_Name => "Iterators_Types";
Deployment::ASN1_Module_Name => "Iterators-Types";
Source_Language => (ASN1);
-- name of the corresponding data type in the source file:
Type_Source_Name => "T-SeqOf";
TASTE::Position_In_File => [ line => 6 ; column => 1 ; ];
TASTE::Position_In_File => [ line => 8 ; column => 1 ; ];
-- what kind of type is this?
TASTE::ASN1_Basic_Type =>aSEQUENCEOF;
END T_SeqOf;
......@@ -326,14 +363,9 @@ SUBCOMPONENTS
T_Int : DATA T_Int.impl;
T_Int32 : DATA T_Int32.impl;
T_Int8 : DATA T_Int8.impl;
T_Null : DATA T_Null.impl;
T_SeqOf : DATA T_SeqOf.impl;
T_UInt32 : DATA T_UInt32.impl;
T_UInt8 : DATA T_UInt8.impl;
END Taste_DataView.others;
DATA ACN_Iterators_Types
PROPERTIES
Source_Text => ("DataView.acn");
Source_Language => (ACN);
END ACN_Iterators_Types;
end DataView;
Iterators-Types DEFINITIONS ::=
BEGIN
T-Null ::= SEQUENCE {}
T-Int ::= INTEGER (0..4)
T-SeqOf ::= SEQUENCE (SIZE (1..4)) OF T-Int
......
......@@ -26,7 +26,7 @@ PACKAGE deploymentview::DV
PUBLIC
WITH interfaceview::IV::orchestrator;
WITH interfaceview::IV::simu;
WITH interfaceview::IV::simulator_gui;
WITH ocarina_processors_x86;
WITH deploymentview::DV::Node1;
WITH Taste;
......@@ -41,8 +41,8 @@ SUBCOMPONENTS
IV_orchestrator : SYSTEM interfaceview::IV::orchestrator::orchestrator.others {
Taste::FunctionName => "orchestrator";
};
IV_simu : SYSTEM interfaceview::IV::simu::simu.others {
Taste::FunctionName => "simu";
IV_simulator_gui : SYSTEM interfaceview::IV::simulator_gui::simulator_gui.others {
Taste::FunctionName => "simulator_gui";
};
demo : PROCESS deploymentview::DV::Node1::demo.others {
Taste::coordinates => "124694 58687 147018 75906";
......@@ -53,7 +53,7 @@ SUBCOMPONENTS
};
PROPERTIES
Taste::APLC_Binding => (reference (demo)) APPLIES TO IV_orchestrator;
Taste::APLC_Binding => (reference (demo)) APPLIES TO IV_simu;
Taste::APLC_Binding => (reference (demo)) APPLIES TO IV_simulator_gui;
Actual_Processor_Binding => (reference (x86_linux)) APPLIES TO demo;
END Node1.others;
......@@ -70,8 +70,8 @@ END deploymentview.others;
PROPERTIES
Taste::coordinates => "0 0 297000 210000";
Taste::version => "2.3";
Taste::version => "2.4";
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;
......@@ -8,6 +8,7 @@
PACKAGE interfaceview::IV::orchestrator
PUBLIC
WITH interfaceview::IV::simulator_gui;
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
......@@ -16,6 +17,8 @@ FEATURES
p1 : IN PARAMETER DataView::T_SeqOf {
Taste::encoding => NATIVE;
};
PROPERTIES
Taste::Associated_Queue_Size => 1;
END PI_arr;
SUBPROGRAM IMPLEMENTATION PI_arr.others
......@@ -24,6 +27,8 @@ PROPERTIES
END PI_arr.others;
SUBPROGRAM PI_paramless
PROPERTIES
Taste::Associated_Queue_Size => 1;
END PI_paramless;
SUBPROGRAM IMPLEMENTATION PI_paramless.others
......@@ -36,6 +41,8 @@ FEATURES
p1 : IN PARAMETER DataView::T_Int {
Taste::encoding => NATIVE;
};
PROPERTIES
Taste::Associated_Queue_Size => 1;
END PI_pulse;
SUBPROGRAM IMPLEMENTATION PI_pulse.others
......@@ -43,23 +50,41 @@ PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_pulse.others;
SUBPROGRAM RI_ParamlessToGui
END RI_ParamlessToGui;
SUBPROGRAM IMPLEMENTATION RI_ParamlessToGui.others
END RI_ParamlessToGui.others;
SYSTEM orchestrator
FEATURES
PI_arr : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::orchestrator::PI_arr.others {
Taste::coordinates => "152466 55901";
Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms;
Taste::InterfaceName => "arr";
};
PI_paramless : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::orchestrator::PI_paramless.others {
Taste::coordinates => "152466 92945";
Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms;
Taste::InterfaceName => "paramless";
};
PI_pulse : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::orchestrator::PI_pulse.others {
Taste::coordinates => "152466 68249";
Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms;
Taste::InterfaceName => "pulse";
};
RI_ParamlessToGui : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::simulator_gui::PI_ParamlessToGui.others {
Taste::coordinates => "152466 77090";
Taste::RCMoperationKind => any;
Taste::InterfaceName => "ParamlessToGui";
Taste::labelInheritance => "true";
};
PROPERTIES
Source_Language => (SDL);
Taste::Active_Interfaces => any;
......@@ -70,7 +95,7 @@ END orchestrator.others;
END interfaceview::IV::orchestrator;
PACKAGE interfaceview::IV::simu
PACKAGE interfaceview::IV::simulator_gui
PUBLIC
WITH interfaceview::IV::orchestrator;
......@@ -103,7 +128,15 @@ END RI_pulse;
SUBPROGRAM IMPLEMENTATION RI_pulse.others
END RI_pulse.others;
SYSTEM simu
SUBPROGRAM PI_ParamlessToGui
END PI_ParamlessToGui;
SUBPROGRAM IMPLEMENTATION PI_ParamlessToGui.others
PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_ParamlessToGui.others;
SYSTEM simulator_gui
FEATURES
RI_arr : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::orchestrator::PI_arr.others {
Taste::coordinates => "119740 57444";
......@@ -123,21 +156,26 @@ FEATURES
Taste::InterfaceName => "pulse";
Taste::labelInheritance => "true";
};
PI_ParamlessToGui : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::simulator_gui::PI_ParamlessToGui.others {
Taste::coordinates => "119740 77761";
Taste::RCMoperationKind => sporadic;
Taste::InterfaceName => "ParamlessToGui";
};
PROPERTIES
Source_Language => (GUI);
Taste::Active_Interfaces => any;
END simu;
END simulator_gui;
SYSTEM IMPLEMENTATION simu.others
END simu.others;
SYSTEM IMPLEMENTATION simulator_gui.others
END simulator_gui.others;
END interfaceview::IV::simu;
END interfaceview::IV::simulator_gui;
PACKAGE interfaceview::IV
PUBLIC
WITH interfaceview::IV::orchestrator;
WITH interfaceview::IV::simu;
WITH interfaceview::IV::simulator_gui;
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
......@@ -152,25 +190,28 @@ SUBCOMPONENTS
orchestrator : SYSTEM interfaceview::IV::orchestrator::orchestrator.others {
Taste::coordinates => "152466 40466 268555 114874";
};
simu : SYSTEM interfaceview::IV::simu::simu.others {
simulator_gui : SYSTEM interfaceview::IV::simulator_gui::simulator_gui.others {
Taste::coordinates => "33291 42009 119740 110860";
};
CONNECTIONS
orchestrator_PI_arr_simu_RI_arr : SUBPROGRAM ACCESS orchestrator.PI_arr -> simu.RI_arr {
simulator_gui_RI_arr_orchestrator_PI_arr : SUBPROGRAM ACCESS orchestrator.PI_arr -> simulator_gui.RI_arr {
Taste::coordinates => "119740 57444 136103 57444 136103 55901 152466 55901";
};
orchestrator_PI_paramless_simu_RI_paramless : SUBPROGRAM ACCESS orchestrator.PI_paramless -> simu.RI_paramless {
simulator_gui_RI_paramless_orchestrator_PI_paramless : SUBPROGRAM ACCESS orchestrator.PI_paramless -> simulator_gui.RI_paramless {
Taste::coordinates => "119740 88314 136103 88314 136103 92945 152466 92945";
};
orchestrator_PI_pulse_simu_RI_pulse : SUBPROGRAM ACCESS orchestrator.PI_pulse -> simu.RI_pulse {
simulator_gui_RI_pulse_orchestrator_PI_pulse : SUBPROGRAM ACCESS orchestrator.PI_pulse -> simulator_gui.RI_pulse {
Taste::coordinates => "119740 66705 136103 66705 136103 68249 152466 68249";
};
orchestrator_RI_ParamlessToGui_simulator_gui_PI_ParamlessToGui : SUBPROGRAM ACCESS simulator_gui.PI_ParamlessToGui -> orchestrator.RI_ParamlessToGui {
Taste::coordinates => "152466 77090 136103 77090 136103 77761 119740 77761";
};
END interfaceview.others;
PROPERTIES
Taste::dataView => ("DataView");
Taste::dataViewPath => ("DataView.aadl");
Taste::coordinates => "0 0 297000 210000";
Taste::version => "2.3";
Taste::version => "2.4";
END interfaceview::IV;
/* CIF PROCESS (250, 150), (150, 75) */
process Orchestrator;
/* CIF TEXT (175, 66), (285, 140) */
/* CIF TEXT (182, 66), (285, 168) */
-- Text area for declarations and comments
dcl t t_int := 0;
......@@ -9,68 +9,84 @@ process Orchestrator;
dcl seqof t_seqof;
/* CIF ENDTEXT */
/* CIF START (546, 52), (70, 34) */
/* CIF START (553, 52), (70, 34) */
START;
/* CIF PROCEDURECALL (471, 106), (220, 35) */
/* CIF PROCEDURECALL (478, 106), (220, 35) */
call writeln( 'Orchestrator startup');
/* CIF NEXTSTATE (547, 156), (67, 35) */
/* CIF NEXTSTATE (555, 156), (67, 35) */
NEXTSTATE wait;
/* CIF state (1001, 80), (72, 35) */
state running;
/* CIF input (1003, 135), (70, 35) */
input *;
/* CIF NEXTSTATE (1003, 190), (70, 35) */
NEXTSTATE wait;
endstate;
/* CIF state (496, 254), (67, 35) */
/* CIF state (503, 254), (67, 35) */
state wait;
/* CIF input (119, 309), (71, 35) */
/* CIF input (112, 309), (71, 35) */
input pulse(t);
/* CIF decision (119, 364), (70, 50) */
/* CIF PROCEDURECALL (44, 364), (207, 35) */
call writeln('[SDL] Got Pulse (', t, ')');
/* CIF decision (113, 414), (70, 50) */
decision t;
/* CIF ANSWER (37, 434), (70, 25) */
/* CIF ANSWER (30, 484), (70, 25) */
(0):
/* CIF task (6, 479), (131, 59) */
/* CIF task (0, 529), (131, 59) */
task seqof := {1,1,1,1},
counter := 0,
t := 0;
/* CIF NEXTSTATE (37, 556), (70, 35) */
/* CIF NEXTSTATE (30, 606), (70, 35) */
NEXTSTATE wait;
/* CIF ANSWER (171, 434), (70, 25) */
/* CIF ANSWER (164, 484), (70, 25) */
else:
/* CIF task (140, 479), (131, 59) */
/* CIF task (134, 529), (131, 59) */
task seqof := {1,1,1,1},
counter := 0,
t := 0;
/* CIF NEXTSTATE (170, 556), (72, 35) */
/* CIF NEXTSTATE (163, 606), (72, 35) */
NEXTSTATE running;
enddecision;
/* CIF input (514, 309), (86, 35) */
/* CIF input (498, 309), (86, 35) */
input arr(seqof);
/* CIF task (450, 364), (214, 35) */
/* CIF PROCEDURECALL (462, 364), (157, 35) */
call write('[SDL] Got Arr (' );
/* CIF task (480, 419), (122, 56) */
task for i in seqof:
call write (i, ' ');
endfor;
/* CIF PROCEDURECALL (498, 495), (86, 35) */
call writeln(')');
/* CIF task (434, 545), (214, 35) */
task counter := (counter + 1) mod 4;
/* CIF decision (495, 419), (124, 50) */
/* CIF decision (479, 600), (124, 50) */
decision seqof = {4,4,4,4}
and counter = 0;
/* CIF ANSWER (381, 489), (70, 25) */
/* CIF ANSWER (365, 670), (70, 25) */
(true):
/* CIF PROCEDURECALL (292, 534), (248, 35) */
/* CIF PROCEDURECALL (276, 715), (248, 35) */
call writeln( 'Property should be checked');
/* CIF ANSWER (656, 489), (70, 25) */
/* CIF ANSWER (640, 670), (70, 25) */
(false):
/* CIF task (551, 534), (281, 35) */
/* CIF task (535, 715), (281, 35) */
task seqof := { 1 } // seqof (1, length(seqof)-1);
enddecision;
/* CIF NEXTSTATE (522, 585), (70, 35) */
/* CIF NEXTSTATE (506, 766), (70, 35) */
NEXTSTATE -;
/* CIF input (871, 309), (87, 35) */
/* CIF input (878, 309), (87, 40) */
input paramless;
/* CIF task (862, 364), (104, 42) */
/* CIF PROCEDURECALL (820, 369), (203, 35) */
call writeln('[SDL] Got Paramless' );
/* CIF output (863, 424), (116, 35) */
output ParamlessToGui;
/* CIF task (870, 474), (104, 42) */
task counter := 4,
t := 1;
/* CIF task (851, 426), (127, 38) */
/* CIF task (858, 536), (127, 38) */
task seqof := {1,1,1,1};
/* CIF NEXTSTATE (878, 479), (72, 35) */
/* CIF NEXTSTATE (886, 589), (72, 35) */
NEXTSTATE running;
endstate;
/* CIF state (1008, 80), (72, 35) */
state running;
/* CIF input (1010, 135), (70, 35) */
input *;
/* CIF PROCEDURECALL (903, 190), (284, 35) */
call writeln('[SDL] got something while running');
/* CIF NEXTSTATE (1010, 240), (70, 35) */
NEXTSTATE wait;
endstate;
endprocess Orchestrator;
\ No newline at end of file
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