| [pok-devel] [34] * examples/partitions-threads/model.aadl |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/pok-devel Archives
]
Revision: 34
Author: julien
Date: 2012-05-30 20:28:51 +0200 (Wed, 30 May 2012)
Log Message:
-----------
* examples/partitions-threads/model.aadl
examples/arinc653-sampling/model.aadl
examples/arinc653-threads/model.aadl
examples/arinc653-errors/model.aadl
examples/case-study-integrated/threads.aadl
examples/case-study-integrated/memories.aadl
examples/arinc653-queueing/model.aadl
- Update AADL models according to updated
ARINC653 annex definition.
Modified Paths:
--------------
trunk/examples/arinc653-errors/model.aadl
trunk/examples/arinc653-queueing/model.aadl
trunk/examples/arinc653-sampling/model.aadl
trunk/examples/arinc653-threads/model.aadl
trunk/examples/case-study-integrated/memories.aadl
trunk/examples/case-study-integrated/threads.aadl
trunk/examples/partitions-threads/model.aadl
Modified: trunk/examples/arinc653-errors/model.aadl
===================================================================
--- trunk/examples/arinc653-errors/model.aadl 2012-05-09 13:40:18 UTC (rev 33)
+++ trunk/examples/arinc653-errors/model.aadl 2012-05-30 18:28:51 UTC (rev 34)
@@ -49,9 +49,9 @@
virtual processor partition
properties
- ARINC653::HM_Errors => (Numeric_Error, Illegal_Request);
- ARINC653::HM_Actions => (Nothing, Partition_Restart);
- POK::Additional_Features => (console);
+ ARINC653::HM_Errors => (Numeric_Error, Illegal_Request);
+ ARINC653::HM_Partition_Recovery_Actions => (Ignore, Warm_Restart);
+ POK::Additional_Features => (console);
end partition;
virtual processor implementation partition.secure
@@ -59,7 +59,7 @@
Provided_Virtual_Bus_Class =>
(classifier (arinchm::secure_bus));
ARINC653::HM_Errors => (Partition_Init, Partition_Scheduling, Partition_Handler, Partition_Config);
- ARINC653::HM_Actions => (Nothing, Partition_Stop, Partition_Restart, Partition_Restart);
+ ARINC653::HM_Partition_Recovery_Actions => (Ignore, Partition_Stop, Warm_Restart, Warm_Restart);
ARINC653::HM_Callback => classifier (arinchm::partitionhm);
POK::Criticality => 10;
end partition.secure;
@@ -70,7 +70,7 @@
Provided_Virtual_Bus_Class =>
(classifier (arinchm::common_bus));
ARINC653::HM_Errors => (Partition_Init, Partition_Scheduling, Partition_Handler, Partition_Config);
- ARINC653::HM_Actions => (Nothing, Partition_Stop, Partition_Restart, Partition_Restart);
+ ARINC653::HM_Partition_Recovery_Actions => (Ignore, Partition_Stop, Warm_Restart, Warm_Restart);
end partition.common;
@@ -101,7 +101,7 @@
POK::Architecture => x86;
POK::BSP => x86_qemu;
ARINC653::HM_Errors => (Hardware_Fault);
- ARINC653::HM_Actions => (Module_Restart);
+ ARINC653::HM_Module_Recovery_Actions => (Reset);
end ppc;
processor implementation ppc.impl
@@ -113,7 +113,7 @@
ARINC653::Partition_Slots => (500ms, 500ms);
ARINC653::Slots_Allocation => ( reference (partition_common), reference (partition_secure));
ARINC653::HM_Errors => (Module_Init, Module_Scheduling, Module_Config);
- ARINC653::HM_Actions => (Nothing, Module_Stop, Module_Restart);
+ ARINC653::HM_Module_Recovery_Actions => (Ignore, Stop, Reset);
ARINC653::HM_Callback => classifier (arinchm::kernelhm);
end ppc.impl;
@@ -161,7 +161,7 @@
parameter pspg.output -> dataout;
properties
ARINC653::HM_Errors => (Deadline_Miss, Application_Error, Numeric_Error, Illegal_Request, Power_Fail, Memory_Violation, Hardware_Fault, Stack_Overflow);
- ARINC653::HM_Actions => (Process_Restart, Ignore, Partition_Restart, Partition_Stop, Ignore, Process_Restart, Process_Restart, Process_Restart);
+ ARINC653::HM_Process_Recovery_Actions => (Process_Restart, Ignore, Warm_Restart, Partition_Stop, Ignore, Process_Restart, Process_Restart, Process_Restart);
end send_ping.impl;
thread implementation receive_ping.impl
@@ -172,7 +172,7 @@
properties
ARINC653::HM_Errors => (Deadline_Miss, Application_Error, Numeric_Error, Illegal_Request, Power_Fail, Memory_Violation, Hardware_Fault, Stack_Overflow);
- ARINC653::HM_Actions => (Process_Restart, Ignore, Partition_Restart, Partition_Stop, Ignore, Process_Restart, Process_Restart, Process_Restart);
+ ARINC653::HM_Process_Recovery_Actions => (Process_Restart, Ignore, Warm_Restart, Partition_Stop, Ignore, Process_Restart, Process_Restart, Process_Restart);
end receive_ping.impl;
subprogram partitionhm
@@ -226,7 +226,7 @@
memory partitionmemory
properties
Word_Count => 80000;
- ARINC653::Memory_Kind => memory_code;
+ ARINC653::Memory_Type => (code_memory);
ARINC653::Access_Type => read;
end partitionmemory;
@@ -236,10 +236,10 @@
memory implementation mainmemory.impl
subcomponents
part1: memory partitionmemory
- {ARINC653::Memory_Kind => memory_code;
+ {ARINC653::Memory_Type => (code_memory);
ARINC653::Access_Type => read;};
part2: memory partitionmemory
- {ARINC653::Memory_Kind => memory_data;
+ {ARINC653::Memory_Type => (data_memory);
ARINC653::Access_Type => write;};
end mainmemory.impl;
Modified: trunk/examples/arinc653-queueing/model.aadl
===================================================================
--- trunk/examples/arinc653-queueing/model.aadl 2012-05-09 13:40:18 UTC (rev 33)
+++ trunk/examples/arinc653-queueing/model.aadl 2012-05-30 18:28:51 UTC (rev 34)
@@ -48,7 +48,7 @@
virtual processor partition
properties
ARINC653::HM_Errors => (Partition_Init);
- ARINC653::HM_Actions => (Partition_Restart);
+ ARINC653::HM_Partition_Recovery_Actions => (Warm_Restart);
POK::Additional_Features => (libc_stdio, console);
end partition;
@@ -110,7 +110,7 @@
Compute_Execution_Time => 0 ms .. 1 ms;
Period => 1000 Ms;
ARINC653::HM_Errors => (Numeric_Error);
- ARINC653::HM_Actions => (Partition_Restart);
+ ARINC653::HM_Process_Recovery_Actions => (Warm_Restart);
Source_Data_Size => 400000 bytes;
Source_Stack_Size => 400000 bytes;
Source_Code_Size => 40 bytes;
@@ -129,7 +129,7 @@
Source_Code_Size => 40 bytes;
Compute_Execution_Time => 0 ms .. 1 ms;
ARINC653::HM_Errors => (Numeric_Error);
- ARINC653::HM_Actions => (Partition_Restart);
+ ARINC653::HM_Process_Recovery_Actions => (Warm_Restart);
end send_ping;
thread implementation send_ping.impl
@@ -185,7 +185,7 @@
memory partitionmemory
properties
Word_Count => 80000;
- ARINC653::Memory_Kind => memory_code;
+ ARINC653::Memory_Type => (code_memory);
ARINC653::Access_Type => read;
end partitionmemory;
@@ -195,10 +195,10 @@
memory implementation mainmemory.impl
subcomponents
part1: memory partitionmemory
- {ARINC653::Memory_Kind => memory_code;
+ {ARINC653::Memory_Type => (code_memory);
ARINC653::Access_Type => read;};
part2: memory partitionmemory
- {ARINC653::Memory_Kind => memory_data;
+ {ARINC653::Memory_Type => (data_memory);
ARINC653::Access_Type => write;};
end mainmemory.impl;
Modified: trunk/examples/arinc653-sampling/model.aadl
===================================================================
--- trunk/examples/arinc653-sampling/model.aadl 2012-05-09 13:40:18 UTC (rev 33)
+++ trunk/examples/arinc653-sampling/model.aadl 2012-05-30 18:28:51 UTC (rev 34)
@@ -49,7 +49,7 @@
PartitionError -[ ErrorRecovered ]-> ProcessExecution;
properties
ARINC653::HM_Errors => (Partition_Config) in modes (PartitionInit);
- ARINC653::HM_Actions => (Nothing) in modes (PartitionInit);
+ ARINC653::HM_Partition_Recovery_Actions => (Ignore) in modes (PartitionInit);
POK::Criticality => 1;
end partition.secure;
@@ -60,7 +60,7 @@
ProcessExecution : mode;
properties
ARINC653::HM_Errors => (Partition_Config) in modes (PartitionInit);
- ARINC653::HM_Actions => (Nothing) in modes (PartitionInit);
+ ARINC653::HM_Partition_Recovery_Actions => (Ignore) in modes (PartitionInit);
POK::Criticality => 10;
end partition.common;
@@ -109,7 +109,7 @@
ARINC653::Partition_Slots => (500 ms, 500 ms);
ARINC653::Slots_Allocation => ( reference (partition_secure), reference (partition_common));
ARINC653::HM_Errors => (Module_Init) in modes (ModuleInit, SystemFunctionExecution);
- ARINC653::HM_Actions => (Module_Restart) in modes (ModuleInit, SystemFunctionExecution);
+ ARINC653::HM_Module_Recovery_Actions => (Reset) in modes (ModuleInit, SystemFunctionExecution);
end ppc.impl;
thread receive_ping
@@ -122,7 +122,7 @@
Compute_Execution_Time => 1 ms .. 2 ms;
Period => 200 Ms;
ARINC653::HM_Errors => (Stack_Overflow);
- ARINC653::HM_Actions => (Ignore);
+ ARINC653::HM_Process_Recovery_Actions => (Ignore);
end receive_ping;
thread send_ping
@@ -134,7 +134,7 @@
Period => 1000 Ms;
Recover_Execution_Time => 10 ms .. 20 ms;
ARINC653::HM_Errors => (Stack_Overflow);
- ARINC653::HM_Actions => (Ignore);
+ ARINC653::HM_Process_Recovery_Actions => (Ignore);
end send_ping;
thread implementation send_ping.impl
@@ -179,7 +179,7 @@
memory partitionmemory
properties
Word_Count => 80000;
- ARINC653::Memory_Kind => memory_code;
+ ARINC653::Memory_Type => (code_memory);
ARINC653::Access_Type => read;
end partitionmemory;
@@ -189,10 +189,10 @@
memory implementation mainmemory.impl
subcomponents
part1: memory partitionmemory
- {ARINC653::Memory_Kind => memory_code;
+ {ARINC653::Memory_Type => (code_memory);
ARINC653::Access_Type => read;};
part2: memory partitionmemory
- {ARINC653::Memory_Kind => memory_data;
+ {ARINC653::Memory_Type => (data_memory);
ARINC653::Access_Type => write;};
end mainmemory.impl;
Modified: trunk/examples/arinc653-threads/model.aadl
===================================================================
--- trunk/examples/arinc653-threads/model.aadl 2012-05-09 13:40:18 UTC (rev 33)
+++ trunk/examples/arinc653-threads/model.aadl 2012-05-30 18:28:51 UTC (rev 34)
@@ -39,8 +39,8 @@
virtual processor partition
properties
ARINC653::HM_Errors => (Partition_Config, Partition_Init, Partition_Handler, Partition_Scheduling);
- ARINC653::HM_Actions => (Partition_Restart, Partition_Restart, Partition_Restart, Partition_Restart);
- POK::Additional_Features => (libc_stdio);
+ ARINC653::HM_Partition_Recovery_Actions => (Warm_Restart, Warm_Restart, Warm_Restart, Warm_Restart);
+ POK::Additional_Features => (libc_stdio, console);
end partition;
virtual processor implementation partition.impl
@@ -64,7 +64,7 @@
ARINC653::Partition_Slots => (500ms, 500ms);
ARINC653::Slots_Allocation => (reference (part1), reference (part2));
ARINC653::HM_Errors => (Module_Config, Module_Init, Module_Scheduling);
- ARINC653::HM_Actions => (Module_Restart, Module_Restart, Module_Restart);
+ ARINC653::HM_Module_Recovery_Actions => (Reset, Reset, Reset);
end ppc.impl;
process myprocess
@@ -99,7 +99,7 @@
Source_Stack_Size => 4 Kbyte;
Source_Data_Size => 4 Kbyte;
ARINC653::HM_Errors => (Deadline_Miss,Application_Error,Numeric_Error,Illegal_Request,Stack_Overflow,Memory_Violation,Hardware_Fault,Power_Fail);
- ARINC653::HM_Actions => (Ignore, Ignore, Ignore, Ignore, Ignore, Ignore, Ignore, Ignore);
+ ARINC653::HM_Process_Recovery_Actions => (Ignore, Ignore, Ignore, Ignore, Ignore, Ignore, Ignore, Ignore);
end mythread.impl1;
thread implementation mythread.impl2
@@ -115,7 +115,7 @@
Source_Stack_Size => 4 Kbyte;
Source_Data_Size => 4 Kbyte;
ARINC653::HM_Errors => (Deadline_Miss,Application_Error,Numeric_Error,Illegal_Request,Stack_Overflow,Memory_Violation,Hardware_Fault,Power_Fail);
- ARINC653::HM_Actions => (Ignore, Ignore, Ignore, Ignore, Ignore, Ignore, Ignore, Ignore);
+ ARINC653::HM_Process_Recovery_Actions => (Ignore, Ignore, Ignore, Ignore, Ignore, Ignore, Ignore, Ignore);
end mythread.impl2;
subprogram thread_starting
@@ -149,7 +149,7 @@
memory partitionmemory
properties
Word_Count => 80000;
- ARINC653::Memory_Kind => memory_code;
+ ARINC653::Memory_Type => (code_memory);
ARINC653::Access_Type => read;
end partitionmemory;
@@ -159,10 +159,10 @@
memory implementation mainmemory.impl
subcomponents
part1: memory partitionmemory
- {ARINC653::Memory_Kind => memory_code;
+ {ARINC653::Memory_Type => (code_memory);
ARINC653::Access_Type => read;};
part2: memory partitionmemory
- {ARINC653::Memory_Kind => memory_data;
+ {ARINC653::Memory_Type => (data_memory);
ARINC653::Access_Type => write;};
end mainmemory.impl;
Modified: trunk/examples/case-study-integrated/memories.aadl
===================================================================
--- trunk/examples/case-study-integrated/memories.aadl 2012-05-09 13:40:18 UTC (rev 33)
+++ trunk/examples/case-study-integrated/memories.aadl 2012-05-30 18:28:51 UTC (rev 34)
@@ -24,14 +24,14 @@
memory implementation segment.data_segment
properties
- ARINC653::Memory_Kind => memory_data;
+ ARINC653::Memory_Type => (data_memory);
ARINC653::Access_Type => read_write;
Byte_Count => 120000;
end segment.data_segment;
memory implementation segment.code_segment
properties
- ARINC653::Memory_Kind => memory_code;
+ ARINC653::Memory_Type => (code_memory);
ARINC653::Access_Type => read;
Byte_Count => 5000;
end segment.code_segment;
Modified: trunk/examples/case-study-integrated/threads.aadl
===================================================================
--- trunk/examples/case-study-integrated/threads.aadl 2012-05-09 13:40:18 UTC (rev 33)
+++ trunk/examples/case-study-integrated/threads.aadl 2012-05-30 18:28:51 UTC (rev 34)
@@ -284,8 +284,8 @@
Period => 50 Ms;
Source_Data_Size => 10 Kbyte;
Source_Code_Size => 10 Kbyte;
- ARINC653::HM_Errors => (Numeric_Error);
- ARINC653::HM_Actions => (Partition_Restart);
+ ARINC653::HM_Errors => (Numeric_Error);
+ ARINC653::HM_Process_Recovery_Actions => (Warm_Restart);
end thread_flightdirector;
thread implementation thread_flightdirector.impl
Modified: trunk/examples/partitions-threads/model.aadl
===================================================================
--- trunk/examples/partitions-threads/model.aadl 2012-05-09 13:40:18 UTC (rev 33)
+++ trunk/examples/partitions-threads/model.aadl 2012-05-30 18:28:51 UTC (rev 34)
@@ -39,8 +39,8 @@
part1 : virtual processor partition.impl;
part2 : virtual processor partition.impl {POK::Additional_Features => (libc_stdlib, libc_stdio);};
properties
- POK::Architecture => sparc;
- POK::BSP => leon3;
+ POK::Architecture => x86;
+ POK::BSP => x86_qemu;
POK::Major_Frame => 1000ms;
POK::Scheduler => static;
POK::Slots => (500ms, 500ms);