Commit 2e8a9dc3 authored by julien.delange's avatar julien.delange
Browse files

* Disable all AADLv1 distributed examples since it cannot

   work with the generic sockets driver that relies on
   AADLv2 components
 * Adapt existing AADLv2 examples to use ASN.1 configuration

 


git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/po-hi-c@2048 129961e7-ef38-4bb5-a8f7-c9a525a55882
parent 09f9be17
SUBDIRS = d3.1.3-1 ping rma sunseeker producer-consumer some-types some-types-stdint flight-mgmt
SUBDIRS = d3.1.3-1 ping rma sunseeker flight-mgmt
SAMPLE_DIR = ${shell $(CYGPATH_U) '$(OCARINA_PREFIX)/examples/ocarina/polyorb-hi-c/aadlv1'}
......
......@@ -5,7 +5,6 @@ AADL_FILES = \
$(srcdir)/ping.aadl
SCENARIO_FILES = \
$(srcdir)/scenario.aadl \
$(srcdir)/scenario-local.aadl
include $(srcdir)/../../Makefile.common
......
......@@ -4,10 +4,9 @@ C_FILES = \
AADL_FILES = \
$(srcdir)/sunseeker.aadl \
$(srcdir)/sunseeker_dist.aadl \
$(srcdir)/sunseeker_local.aadl
SCENARIO_FILES = $(srcdir)/scenario_local.aadl $(srcdir)/scenario_dist.aadl
SCENARIO_FILES = $(srcdir)/scenario_local.aadl
include $(srcdir)/../../Makefile.common
......
#include <drivers/configuration/ip.h>
__po_hi_c_ip_conf_t __po_hi_c_confvar_device_a = { "eth0", "127.0.0.1", __po_hi_c_ipv4, 1234};
__po_hi_c_ip_conf_t __po_hi_c_confvar_device_b = { "eth0", "127.0.0.1", __po_hi_c_ipv4, 1235};
......@@ -8,23 +8,14 @@
package Pack::Ping
public
with Deployment, Software;
---------------
-- Bus --
---------------
bus Ethernet_Bus
properties
Deployment::Transport_API => BSD_Sockets;
end Ethernet_Bus;
with ocarina_drivers;
with ocarina_buses;
---------------
-- Processor --
---------------
processor the_processor
features
ETH : requires bus access Ethernet_Bus;
properties
Deployment::location => "127.0.0.1";
Deployment::Execution_Platform => Native;
......@@ -68,17 +59,25 @@ end PING;
system implementation PING.Native
subcomponents
Node_A : process A.Impl;
Node_B : process B.Impl {Deployment::port_number => 12002;};
CPU : processor the_processor {Priority_Range => 0 .. 255;};
the_bus : bus Ethernet_Bus;
Node_B : process B.Impl;
Device_A : device ocarina_drivers::generic_sockets_ip.pohic
{Source_Text => ("devicesconf.c");};
Device_B : device ocarina_drivers::generic_sockets_ip.pohic
{Source_Text => ("devicesconf.c");};
CPU_A : processor the_processor {Priority_Range => 0 .. 255;};
CPU_B : processor the_processor {Priority_Range => 0 .. 255;};
the_bus : bus ocarina_buses::ip.i;
connections
bus access the_bus -> CPU.ETH;
bus access the_bus -> Device_A.thebus;
bus access the_bus -> Device_B.thebus;
port Node_A.Out_Port -> Node_B.In_Port
{Actual_Connection_Binding => (reference (the_bus));};
properties
actual_processor_binding => reference (CPU) applies to Node_A;
actual_processor_binding => reference (CPU) applies to Node_B;
actual_processor_binding => reference (CPU_A) applies to Node_A;
actual_processor_binding => reference (CPU_B) applies to Node_B;
actual_processor_binding => (reference (CPU_A)) applies to Device_A;
actual_processor_binding => (reference (CPU_B)) applies to Device_B;
end PING.Native;
end PACK::Ping;
......@@ -6,6 +6,7 @@
system import
properties
Ocarina_Config::Timeout_Property => 4000ms;
Ocarina_Config::Use_Components_Library => true;
Ocarina_Config::Referencial_Files =>
("node_a", "node_a_native.ref",
"node_b", "node_b_native.ref");
......
#include <drivers/configuration/ip.h>
__po_hi_c_ip_conf_t __po_hi_c_confvar_device_a = { "eth0", "127.0.0.1", __po_hi_c_ipv4, 1234};
__po_hi_c_ip_conf_t __po_hi_c_confvar_device_b = { "eth0", "127.0.0.1", __po_hi_c_ipv4, 1235};
......@@ -9,7 +9,7 @@ public
processor the_processor
properties
Deployment::Execution_Platform => Native;
Deployment::Execution_Platform => native;
end the_processor;
processor implementation the_processor.Impl
......
......@@ -8,14 +8,14 @@ package PING
public
with Software;
with Deployment;
with ocarina_drivers;
with ocarina_buses;
---------------
-- Processor --
---------------
processor the_processor
features
ETH : requires bus access Ethernet_Bus;
properties
Deployment::location => "127.0.0.1";
Deployment::Execution_Platform => Native;
......@@ -70,17 +70,27 @@ end PING;
system implementation PING.Impl
subcomponents
Node_A : process A.Impl;
Node_B : process B.Impl {Deployment::port_number => 12002;};
Node_B : process B.Impl;
Device_A : device ocarina_drivers::generic_sockets_ip.pohic
{Source_Text => ("devicesconf.c");};
Device_B : device ocarina_drivers::generic_sockets_ip.pohic
{Source_Text => ("devicesconf.c");};
CPU : processor the_processor;
the_bus : bus Ethernet_Bus;
CPU_A : processor the_processor;
CPU_B : processor the_processor;
the_bus : bus ocarina_buses::ip.i;
connections
bus access the_bus -> CPU.ETH;
bus access the_bus -> Device_A.thebus;
bus access the_bus -> Device_B.thebus;
port Node_A.Out_Port -> Node_B.In_Port
{Actual_Connection_Binding => (reference (the_bus));};
properties
actual_processor_binding => reference (CPU) applies to Node_A;
actual_processor_binding => reference (CPU) applies to Node_B;
actual_processor_binding => reference (CPU_A) applies to Node_A;
actual_processor_binding => reference (CPU_B) applies to Node_B;
actual_processor_binding => (reference (CPU_A)) applies to Device_A;
actual_processor_binding => (reference (CPU_B)) applies to Device_B;
end PING.Impl;
end PING;
system ping
properties
Ocarina_Config::Timeout_Property => 4000ms;
Ocarina_Config::Use_Components_Library => true;
Ocarina_Config::Referencial_Files =>
("node_a", "node_a.ref",
"node_b", "node_b.ref");
......
#include <drivers/configuration/ip.h>
__po_hi_c_ip_conf_t __po_hi_c_confvar_device_a = { "eth0", "127.0.0.1", __po_hi_c_ipv4, 1234};
__po_hi_c_ip_conf_t __po_hi_c_confvar_device_b = { "eth0", "127.0.0.1", __po_hi_c_ipv4, 1235};
package Producer::Consumer
public
with Deployment, Software;
---------
-- Bus --
---------
bus Ethernet_Bus
properties
Deployment::Transport_API => BSD_Sockets;
end Ethernet_Bus;
with ocarina_drivers;
with ocarina_buses;
---------------
-- Processor --
---------------
processor the_processor
features
ETH : requires bus access Ethernet_Bus;
properties
Deployment::location => "127.0.0.1";
Deployment::Execution_Platform => Native;
end the_processor;
processor implementation the_processor.i
end the_processor.i;
---------------
-- Processes --
---------------
......@@ -68,18 +61,26 @@ system implementation PC_Simple.Impl
subcomponents
pr_A : process A.Impl {Deployment::port_number => 4001;};
pr_B : process B.Impl {Deployment::port_number => 4002;};
CPU : processor the_processor;
the_bus : bus Ethernet_Bus;
Device_A : device ocarina_drivers::generic_sockets_ip.pohic
{Source_Text => ("devicesconf.c");};
Device_B : device ocarina_drivers::generic_sockets_ip.pohic
{Source_Text => ("devicesconf.c");};
CPU_A : processor the_processor.i;
CPU_B : processor the_processor.i;
the_bus : bus ocarina_buses::ip.i;
connections
bus access the_bus -> CPU.ETH;
bus access the_bus -> Device_A.thebus;
bus access the_bus -> Device_B.thebus;
port pr_A.Alpha -> pr_B.Beta
{Actual_Connection_Binding => (reference (the_bus));};
port pr_B.Alpha -> pr_A.Beta
{Actual_Connection_Binding => (reference (the_bus));};
properties
actual_processor_binding => reference (CPU) applies to pr_A;
actual_processor_binding => reference (CPU) applies to pr_B;
actual_processor_binding => reference (CPU_A) applies to pr_A;
actual_processor_binding => reference (CPU_B) applies to pr_B;
actual_processor_binding => (reference (CPU_A)) applies to Device_A;
actual_processor_binding => (reference (CPU_B)) applies to Device_B;
end PC_Simple.Impl;
end Producer::Consumer;
......@@ -5,6 +5,7 @@
system producer_consumer
properties
Ocarina_Config::Use_Components_Library => true;
Ocarina_Config::Timeout_Property => 4000ms;
Ocarina_Config::Referencial_Files =>
("pr_a", "pr_a.ref",
......
#include <drivers/configuration/ip.h>
__po_hi_c_ip_conf_t __po_hi_c_confvar_device_a = { "eth0", "127.0.0.1", __po_hi_c_ipv4, 1234};
__po_hi_c_ip_conf_t __po_hi_c_confvar_device_b = { "eth0", "127.0.0.1", __po_hi_c_ipv4, 1235};
......@@ -6,6 +6,7 @@
system some_types
properties
Ocarina_Config::Timeout_Property => 4000ms;
Ocarina_Config::Use_Components_Library => true;
Ocarina_Config::Referencial_Files =>
("node_a", "node_a.ref",
"node_b", "node_b.ref");
......
......@@ -2,28 +2,18 @@ package Some_types
public
with Software;
with Deployment;
with ocarina_drivers;
with ocarina_buses;
---------------
-- Processor --
---------------
processor the_processor
features
ETH : requires bus access Ethernet_Bus;
properties
Deployment::location => "127.0.0.1";
Deployment::Execution_Platform => Native;
end the_processor;
---------
-- Bus --
---------
bus Ethernet_Bus
properties
Deployment::Transport_API => BSD_Sockets;
end Ethernet_Bus;
---------------
-- Processes --
---------------
......@@ -67,19 +57,28 @@ end Some_Types_Stdint;
system implementation Some_Types_Stdint.Impl
subcomponents
Node_A : process A.Impl;
Node_B : process B.Impl {Deployment::port_number => 12002;};
CPU : processor the_processor;
the_bus : bus Ethernet_Bus;
Node_B : process B.Impl;
Device_A : device ocarina_drivers::generic_sockets_ip.pohic
{Source_Text => ("devicesconf.c");};
Device_B : device ocarina_drivers::generic_sockets_ip.pohic
{Source_Text => ("devicesconf.c");};
CPU_A : processor the_processor;
CPU_B : processor the_processor;
the_bus : bus ocarina_buses::ip.i;
connections
bus access the_bus -> CPU.ETH;
bus access the_bus -> Device_A.thebus;
bus access the_bus -> Device_B.thebus;
port Node_A.Out_Boolean -> Node_B.In_Boolean
{Actual_Connection_Binding => (reference (the_bus));};
port Node_A.Out_Integer -> Node_B.In_Integer
{Actual_Connection_Binding => (reference (the_bus));};
properties
actual_processor_binding => reference (CPU) applies to Node_A;
actual_processor_binding => reference (CPU) applies to Node_B;
actual_processor_binding => (reference (CPU_A)) applies to Node_A;
actual_processor_binding => (reference (CPU_B)) applies to Node_B;
actual_processor_binding => (reference (CPU_A)) applies to Device_A;
actual_processor_binding => (reference (CPU_B)) applies to Device_B;
end Some_Types_Stdint.Impl;
end Some_Types;
#include <drivers/configuration/ip.h>
__po_hi_c_ip_conf_t __po_hi_c_confvar_device_a = { "eth0", "127.0.0.1", __po_hi_c_ipv4, 1234};
__po_hi_c_ip_conf_t __po_hi_c_confvar_device_b = { "eth0", "127.0.0.1", __po_hi_c_ipv4, 1235};
......@@ -6,6 +6,7 @@
system some_types
properties
Ocarina_Config::Timeout_Property => 4000ms;
Ocarina_Config::Use_Components_Library => true;
Ocarina_Config::Referencial_Files =>
("node_a", "node_a.ref",
"node_b", "node_b.ref");
......
......@@ -2,28 +2,18 @@ package Some_types
public
with Software;
with Deployment;
with ocarina_drivers;
with ocarina_buses;
---------------
-- Processor --
---------------
processor the_processor
features
ETH : requires bus access Ethernet_Bus;
properties
Deployment::location => "127.0.0.1";
Deployment::Execution_Platform => Native;
end the_processor;
---------
-- Bus --
---------
bus Ethernet_Bus
properties
Deployment::Transport_API => BSD_Sockets;
end Ethernet_Bus;
---------------
-- Processes --
---------------
......@@ -72,12 +62,17 @@ end Some_Types;
system implementation Some_Types.Impl
subcomponents
Node_A : process A.Impl;
Node_B : process B.Impl {Deployment::port_number => 12002;};
CPU : processor the_processor;
the_bus : bus Ethernet_Bus;
Node_B : process B.Impl;
Device_A : device ocarina_drivers::generic_sockets_ip.pohic
{Source_Text => ("devicesconf.c");};
Device_B : device ocarina_drivers::generic_sockets_ip.pohic
{Source_Text => ("devicesconf.c");};
CPU_A : processor the_processor;
CPU_B : processor the_processor;
the_bus : bus ocarina_buses::ip.i;
connections
bus access the_bus -> CPU.ETH;
bus access the_bus -> Device_A.thebus;
bus access the_bus -> Device_B.thebus;
port Node_A.Out_Boolean -> Node_B.In_Boolean
{Actual_Connection_Binding => (reference (the_bus));};
port Node_A.Out_Integer -> Node_B.In_Integer
......@@ -85,8 +80,10 @@ connections
port Node_A.Out_Struct -> Node_B.In_Struct
{Actual_Connection_Binding => (reference (the_bus));};
properties
actual_processor_binding => reference (CPU) applies to Node_A;
actual_processor_binding => reference (CPU) applies to Node_B;
actual_processor_binding => (reference (CPU_A)) applies to Node_A;
actual_processor_binding => (reference (CPU_B)) applies to Node_B;
actual_processor_binding => (reference (CPU_A)) applies to Device_A;
actual_processor_binding => (reference (CPU_B)) applies to Device_B;
end Some_Types.Impl;
end Some_Types;
#include <drivers/configuration/ip.h>
__po_hi_c_ip_conf_t __po_hi_c_confvar_device_a = { "eth0", "127.0.0.1", __po_hi_c_ipv4, 1234};
__po_hi_c_ip_conf_t __po_hi_c_confvar_device_b = { "eth0", "127.0.0.1", __po_hi_c_ipv4, 1235};
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