Commit 655ae06c authored by yoogx's avatar yoogx

* Update test042 to reflect new ARINC property sets, no impact

          on tested features (connections)
parent 5fbcffdf
AADL_VERSION=-aadlv2 arinc653_properties.aadl
AADL_VERSION=-aadlv2 arinc653.aadl
-- Regression test for ticket 47
-- Ocarina must check qualified reference
-- Ocarina must check qualified reference
-- in connections subclause
package PartitionedSystemExample
......@@ -46,7 +46,7 @@ subprogram sensor_receiveinput_spg
end sensor_receiveinput_spg;
subprogram commandboard_receiveinput_spg
end commandboard_receiveinput_spg;
end commandboard_receiveinput_spg;
subprogram commandboard_printinfos_spg
end commandboard_printinfos_spg;
......@@ -65,8 +65,6 @@ properties
Period => 20 ms;
Compute_Execution_Time => 10 ms .. 12 ms;
Deadline => 40 ms;
ARINC653::HM_Errors => (Deadline_Miss, Application_Error, Numeric_Error, Illegal_Request);
ARINC653::HM_Process_Recovery_Actions => (Process_Stop, Process_Stop, Ignore, Ignore);
end sensor_temperature_thread;
thread implementation sensor_temperature_thread.impl
......@@ -83,8 +81,6 @@ properties
Period => 20 ms;
Compute_Execution_Time => 8 ms .. 10 ms;
Deadline => 40 ms;
ARINC653::HM_Errors => (Deadline_Miss, Application_Error, Numeric_Error, Illegal_Request);
ARINC653::HM_Process_Recovery_Actions => (Process_Stop, Process_Stop, Process_Stop, Process_Stop);
end sensor_receiveinput_thread;
thread implementation sensor_receiveinput_thread.impl
......@@ -105,8 +101,6 @@ properties
Period => 20 ms;
Compute_Execution_Time => 5 ms .. 7 ms;
Deadline => 40 ms;
ARINC653::HM_Errors => (Deadline_Miss, Application_Error, Numeric_Error, Illegal_Request);
ARINC653::HM_Process_Recovery_Actions => (Process_Stop, Process_Stop, Process_Stop, Process_Stop);
end commandboard_receiveinput_thread;
thread commandboard_printinfos_thread
......@@ -122,8 +116,6 @@ properties
Period => 20 ms;
Compute_Execution_Time => 2 ms .. 6 ms;
Deadline => 40 ms;
ARINC653::HM_Errors => (Deadline_Miss, Application_Error, Numeric_Error, Illegal_Request);
ARINC653::HM_Process_Recovery_Actions => (Process_Stop, Process_Stop, Process_Stop, Process_Stop);
end commandboard_printinfos_thread;
-- Now, declare process that model partition address space
......@@ -154,7 +146,7 @@ process partition2_process
features
queueingout: out event data port integer;
-- In the context of a event data port, the ARINC653::Timeout property
-- is the timeout we used in the APEX functions.
-- is the timeout we used in the APEX functions.
samplingin: in data port integer {ARINC653::Sampling_Refresh_Period => 10ms;};
-- The ARINC653::Timeout apply only to in data port. It is the refresh
-- period for sampling ports.
......@@ -189,10 +181,6 @@ subcomponents
part2: virtual processor partition2_rt.impl;
properties
ARINC653::Module_Major_Frame => 50ms;
ARINC653::Partition_Slots => (10ms, 10ms, 30ms);
ARINC653::Slots_Allocation => (reference (part1), reference (part2), reference (part1));
ARINC653::HM_Errors => (Power_Fail);
ARINC653::HM_Module_Recovery_Actions => (Reset);
end powerpc.impl;
......
......@@ -7,64 +7,80 @@
property set ARINC653 is
Partition_Slots : list of Time
applies to (processor);
Slots_Allocation : list of reference (
virtual processor)
applies to (processor);
Module_Major_Frame : Time
applies to (processor);
applies to (processor, virtual processor);
Sampling_Refresh_Period : Time
applies to (data port);
Supported_Error_Code : type enumeration (Module_Config, Module_Init, Module_Scheduling, Partition_Scheduling, Partition_Config, Partition_Handler, Partition_Init, Deadline_Miss, Application_Error, Numeric_Error, Illegal_Request, Stack_Overflow, Memory_Violation, Hardware_Fault, Power_Fail);
Supported_Partition_Recovery_Action : type enumeration (Ignore, Partition_Stop, Warm_Restart, Cold_Restart);
Supported_Memory_Type : type enumeration (Data_Memory, Code_Memory, IO_Memory);
Supported_Process_Recovery_Action : type enumeration (Ignore, Confirm, Partition_Stop, Process_Stop, Process_Stop_And_Start_Another, Process_Restart, Nothing, Cold_Restart, Warm_Restart);
Memory_Type : list of ARINC653::Supported_Memory_Type
applies to (memory);
Supported_Module_Recovery_Action : type enumeration (Ignore, Stop, Reset);
Timeout : Time
applies to (port, access connections);
HM_Module_Recovery_Actions : list of ARINC653::Supported_Module_Recovery_Action
Supported_DAL_Type : type enumeration (LEVEL_A, LEVEL_B, LEVEL_C, LEVEL_D, LEVEL_E);
DAL : ARINC653::Supported_DAL_Type
applies to (virtual processor, system, abstract);
Module_Version : aadlstring
applies to (processor);
HM_Partition_Recovery_Actions : list of ARINC653::Supported_Partition_Recovery_Action
Module_Identifier : aadlstring
applies to (processor);
Partition_Identifier : aadlinteger
applies to (virtual processor);
HM_Process_Recovery_Actions : list of ARINC653::Supported_Process_Recovery_Action
applies to (thread);
Partition_Name : aadlstring
applies to (virtual processor);
System_Partition : aadlboolean
applies to (virtual processor);
Supported_Access_Type : type enumeration (read, write, read_write);
Error_Handling : reference (
thread)
applies to (virtual processor);
Supported_Memory_Type : type enumeration (Data_Memory, Code_Memory, IO_Memory);
Error_Level_Type : type enumeration (Module_Level, Partition_Level, Process_Level);
HM_Errors : list of ARINC653::Supported_Error_Code
applies to (processor, virtual processor, thread);
HM_Error_ID_Level_Type : type record (ErrorIdentifier : aadlinteger; Description : aadlstring; ErrorLevel : ARINC653::Error_Level_Type; ErrorCode : ARINC653::Supported_Error_Code;);
HM_Callback : classifier (
subprogram classifier)
applies to (thread, virtual processor, processor);
HM_Error_ID_Levels : list of ARINC653::HM_Error_ID_Level_Type
applies to (processor);
Memory_Type : list of ARINC653::Supported_Memory_Type
applies to (memory);
HM_Error_ID_Action_Type : type record (ErrorIdentifier : aadlinteger; Description : aadlstring; Action : aadlstring;);
Access_Type : ARINC653::Supported_Access_Type
applies to (memory);
HM_Error_ID_Actions : list of ARINC653::HM_Error_ID_Action_Type
applies to (processor, virtual processor, thread);
Timeout : Time
applies to (data port, event data port, event port, data access);
State_Information_Type : type record (Identifier : aadlinteger; Description : aadlstring;);
Supported_DAL_Type : type enumeration (LEVEL_A, LEVEL_B, LEVEL_C, LEVEL_D, LEVEL_E);
State_Information : ARINC653::State_Information_Type
applies to (mode);
DAL : ARINC653::Supported_DAL_Type
applies to (virtual processor);
Queueing_Discipline_Type : type enumeration (Fifo, By_Priority);
Queueing_Discipline : ARINC653::Queueing_Discipline_Type
applies to (port, data access);
Schedule_Window : type record (Partition : reference (
virtual processor, processor); Duration : time; Periodic_Processing_Start : aadlboolean;);
System_Overhead_Time : Time
Module_Schedule : list of ARINC653::Schedule_Window
applies to (processor, virtual processor);
Time_Capacity : Time
applies to (thread);
Deadline_Type : enumeration (soft, hard)
applies to (thread);
end ARINC653;
package PartitionedSystemExample
......@@ -125,8 +141,6 @@ public
Period => 20 ms;
Compute_Execution_Time => 10 ms .. 12 ms;
Deadline => 40 ms;
ARINC653::HM_Errors => (Deadline_Miss, Application_Error, Numeric_Error, Illegal_Request);
ARINC653::HM_Process_Recovery_Actions => (Process_Stop, Process_Stop, Ignore, Ignore);
end sensor_temperature_thread;
......@@ -145,8 +159,6 @@ public
Period => 20 ms;
Compute_Execution_Time => 8 ms .. 10 ms;
Deadline => 40 ms;
ARINC653::HM_Errors => (Deadline_Miss, Application_Error, Numeric_Error, Illegal_Request);
ARINC653::HM_Process_Recovery_Actions => (Process_Stop, Process_Stop, Process_Stop, Process_Stop);
end sensor_receiveinput_thread;
......@@ -167,8 +179,6 @@ public
Period => 20 ms;
Compute_Execution_Time => 5 ms .. 7 ms;
Deadline => 40 ms;
ARINC653::HM_Errors => (Deadline_Miss, Application_Error, Numeric_Error, Illegal_Request);
ARINC653::HM_Process_Recovery_Actions => (Process_Stop, Process_Stop, Process_Stop, Process_Stop);
end commandboard_receiveinput_thread;
......@@ -186,8 +196,6 @@ public
Period => 20 ms;
Compute_Execution_Time => 2 ms .. 6 ms;
Deadline => 40 ms;
ARINC653::HM_Errors => (Deadline_Miss, Application_Error, Numeric_Error, Illegal_Request);
ARINC653::HM_Process_Recovery_Actions => (Process_Stop, Process_Stop, Process_Stop, Process_Stop);
end commandboard_printinfos_thread;
......@@ -247,10 +255,6 @@ public
properties
ARINC653::Module_Major_Frame => 50 ms;
ARINC653::Partition_Slots => (10 ms, 10 ms, 30 ms);
ARINC653::Slots_Allocation => (reference ( part1 ), reference ( part2 ), reference ( part1 ));
ARINC653::HM_Errors => (Power_Fail);
ARINC653::HM_Module_Recovery_Actions => (Reset);
end powerpc.impl;
......
Markdown is supported
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