Commit 732f3930 authored by yoogx's avatar yoogx

Merge branch 'spark2014'

Conflicts:
	src/Makefile.am
	support/update_headers.sh
parents 678782f9 014306ed
...@@ -20,18 +20,13 @@ build-all: ...@@ -20,18 +20,13 @@ build-all:
fi fi
check-all: build-all check-all: build-all
if test ! "$(CHECKABLE_SCENARIO_FILES)" = ""; then \
# XXX the following has been disabled due to issue with the execution $(MAKE) scenarios-check; \
# of test programs by emulators elif test ! "$(CHECKABLE_SCENARIO_FILE)" = ""; then \
# $(MAKE) scenario-check; \
# if test ! "$(CHECKABLE_SCENARIO_FILES)" = ""; then \ else \
# $(MAKE) scenarios-check; \ echo "No scenario files, nothing to be done"; \
# elif test ! "$(CHECKABLE_SCENARIO_FILE)" = ""; then \ fi
# $(MAKE) scenario-check; \
# else \
# echo "No scenario files, nothing to be done"; \
# fi
############################################################################ ############################################################################
# Code generation from AADL # Code generation from AADL
...@@ -97,4 +92,3 @@ debug-makefile: ...@@ -97,4 +92,3 @@ debug-makefile:
@echo "SAMPLE_DIR = $(SAMPLE_DIR)" @echo "SAMPLE_DIR = $(SAMPLE_DIR)"
@echo "SCENARIO_FILES = $(SCENARIO_FILES)" @echo "SCENARIO_FILES = $(SCENARIO_FILES)"
@echo "SCENARIO_FILE = $(SCENARIO_FILE)" @echo "SCENARIO_FILE = $(SCENARIO_FILE)"
...@@ -19,7 +19,7 @@ REF_OUTPUTS = $(srcdir)/node_a_leon.ref ...@@ -19,7 +19,7 @@ REF_OUTPUTS = $(srcdir)/node_a_leon.ref
include $(srcdir)/../../Makefile.common include $(srcdir)/../../Makefile.common
SCENARIO_FILES=$(srcdir)/scenario.aadl SCENARIO_FILES=$(srcdir)/scenario.aadl
CHECKABLE_SCENARIO_FILES= CHECKABLE_SCENARIO_FILES=$(SCENARIO_FILES)
if HAS_GNATMAKE_FOR_LEON if HAS_GNATMAKE_FOR_LEON
SCENARIO_FILES+=$(srcdir)/scenario_local.aadl SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
......
...@@ -24,7 +24,7 @@ AADL_SOURCES = \ ...@@ -24,7 +24,7 @@ AADL_SOURCES = \
include $(srcdir)/../../Makefile.common include $(srcdir)/../../Makefile.common
SCENARIO_FILES=$(srcdir)/scenario.aadl SCENARIO_FILES=$(srcdir)/scenario.aadl
CHECKABLE_SCENARIO_FILES= CHECKABLE_SCENARIO_FILES= $(SCENARIO_FILES)
if HAS_GNATMAKE_FOR_MARTE if HAS_GNATMAKE_FOR_MARTE
SCENARIO_FILES+=$(srcdir)/scenario_local_marte.aadl SCENARIO_FILES+=$(srcdir)/scenario_local_marte.aadl
......
[ 0.006661000] Hello! This is the pinger thread starting [ 0.006661000] Hello! This is the pinger thread starting
[ 0.006661000] Hello! This is the pinger thread starting
[ 0.006691000] Sending ORDER: TRUE [ 0.006691000] Sending ORDER: TRUE
[ 0.006698000] ORDER: TRUE [ 0.006698000] ORDER: TRUE
[ 0.006704000] Sending (+1) PING 1 [ 0.006704000] Sending (+1) PING 1
...@@ -11,4 +12,3 @@ ...@@ -11,4 +12,3 @@
[ 3.006810000] Sending ORDER: FALSE [ 3.006810000] Sending ORDER: FALSE
[ 3.006823000] ORDER: FALSE [ 3.006823000] ORDER: FALSE
[ 3.006829000] Sending (+5) PING 12 [ 3.006829000] Sending (+5) PING 12
...@@ -51,7 +51,7 @@ package body Ping is ...@@ -51,7 +51,7 @@ package body Ping is
begin begin
Order := not Order; Order := not Order;
Data_Source := Order; Data_Source := Order;
Put_Line (Normal, "Sending ORDER: " & Opaque_Type'Image (Order)); Put_Line (Normal, "Sending ORDER: " + Opaque_Type'Image (Order));
end Do_Ping_Spg; end Do_Ping_Spg;
-------------------- --------------------
...@@ -63,14 +63,14 @@ package body Ping is ...@@ -63,14 +63,14 @@ package body Ping is
Data_Source : out Simple_type) Data_Source : out Simple_type)
is is
begin begin
Put_Line (Normal, "ORDER: " & Opaque_Type'Image (Data_Sink)); Put_Line (Normal, "ORDER: " + Opaque_Type'Image (Data_Sink));
if Data_Sink then if Data_Sink then
Var := Var + 1; Var := Var + 1;
Put_Line (Normal, "Sending (+1) PING" & Simple_Type'Image (Var)); Put_Line (Normal, "Sending (+1) PING" + Simple_Type'Image (Var));
else else
Var := Var + 5; Var := Var + 5;
Put_Line (Normal, "Sending (+5) PING" & Simple_Type'Image (Var)); Put_Line (Normal, "Sending (+5) PING" + Simple_Type'Image (Var));
end if; end if;
Data_Source := Var; Data_Source := Var;
......
-- This is a scenario file describing the AADL -- This is a scenario file describing the AADL
-- application ping -- application ping
-- $Id: scenario.aadl 6713 2009-06-20 20:58:28Z lanarre $ -- $Id: scenario.aadl 6713 2009-06-20 20:58:28Z lanarre $
system ping system ping
properties properties
Ocarina_Config::Timeout_Property => 4000ms; Ocarina_Config::Timeout_Property => 5000ms;
Ocarina_Config::Referencial_Files => Ocarina_Config::Referencial_Files =>
("node_a", "node_a_native.ref", ("node_a", "node_a_native.ref",
"node_b", "node_b_native.ref"); "node_b", "node_b_native.ref");
Ocarina_Config::AADL_Files => Ocarina_Config::AADL_Files =>
("ping.aadl", "software.aadl"); ("ping.aadl", "software.aadl");
Ocarina_Config::Generator => polyorb_hi_ada; Ocarina_Config::Generator => polyorb_hi_ada;
Ocarina_Config::Needed_Property_Sets => Ocarina_Config::Needed_Property_Sets =>
(value (Ocarina_Config::Data_Model), (value (Ocarina_Config::Data_Model),
value (Ocarina_Config::Deployment), value (Ocarina_Config::Deployment),
value (Ocarina_Config::Cheddar_Properties)); value (Ocarina_Config::Cheddar_Properties));
Ocarina_Config::AADL_Version => AADLv2; Ocarina_Config::AADL_Version => AADLv2;
end ping; end ping;
system implementation ping.Impl system implementation ping.Impl
end ping.Impl; end ping.Impl;
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2009, GET-Telecom Paris. -- -- Copyright (C) 2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- -- -- --
-- PolyORB HI is free software; you can redistribute it and/or modify it -- -- PolyORB HI is free software; you can redistribute it and/or modify it --
-- under terms of the GNU General Public License as published by the Free -- -- under terms of the GNU General Public License as published by the Free --
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
-- however invalidate any other reasons why the executable file might be -- -- however invalidate any other reasons why the executable file might be --
-- covered by the GNU Public License. -- -- covered by the GNU Public License. --
-- -- -- --
-- PolyORB HI is maintained by GET Telecom Paris -- -- PolyORB-HI/Ada is maintained by the TASTE project --
-- (taste-users@lists.tuxfamily.org) --
-- -- -- --
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
...@@ -61,6 +62,11 @@ package body Producer_Consumer is ...@@ -61,6 +62,11 @@ package body Producer_Consumer is
procedure Produce_Spg (Data_Source : out Alpha_Type) is procedure Produce_Spg (Data_Source : out Alpha_Type) is
begin begin
Data_Source := The_Data; Data_Source := The_Data;
if The_Data > 1000 then
The_Data := 1;
end if;
The_Data := The_Data + 1; The_Data := The_Data + 1;
Put_Line (Normal, Get_Node Put_Line (Normal, Get_Node
......
...@@ -15,6 +15,9 @@ AADL_SOURCES = \ ...@@ -15,6 +15,9 @@ AADL_SOURCES = \
include $(srcdir)/../../Makefile.common include $(srcdir)/../../Makefile.common
SCENARIO_FILE=$(srcdir)/scenario.aadl SCENARIO_FILE=$(srcdir)/scenario.aadl
CHECKABLE_SCENARIO_FILES=
#$(SCENARIO_FILE)
# For this example, there is an issue in the ordering of events arriving..
EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILE) EXTRA_DIST = $(ADA_SPECS) $(ADA_BODIES) $(AADL_SOURCES) $(SCENARIO_FILE)
......
[ 0.004515000] ***** Received Boolean_Type: TRUE ***** Received Boolean_Type: TRUE
[ 0.004553000] ***** Received Integer_Type: 1 ***** Received Integer_Type: 1
[ 0.004610000] ***** Receivinng Array : ( 1, 2, 3, 4) ***** Receivinng Array : ( 1, 2, 3, 4)
[ 0.004642000] ***** Received String_Type: "Bounded string message" ***** Received String_Type: "Bounded string message"
[ 1.004364000] ***** Received Boolean_Type: FALSE ***** Received Boolean_Type: FALSE
[ 1.004432000] ***** Received Integer_Type: 2 ***** Received Integer_Type: 2
[ 1.004477000] ***** Receivinng Array : ( 2, 3, 4, 1) ***** Receivinng Array : ( 2, 3, 4, 1)
[ 1.004525000] ***** Received String_Type: "Longer bounded string message" ***** Received String_Type: "Longer bounded string message"
[ 2.004523000] ***** Receivinng Array : ( 3, 4, 1, 2) ***** Received Boolean_Type: TRUE
[ 2.004530000] ***** Received Boolean_Type: TRUE ***** Received Integer_Type: 3
[ 2.004545000] ***** Received String_Type: "Even longer bounded string message" ***** Receivinng Array : ( 3, 4, 1, 2)
[ 2.004551000] ***** Received Integer_Type: 3 ***** Received String_Type: "Even longer bounded string message"
[ 3.004497000] ***** Received Boolean_Type: FALSE ***** Received Boolean_Type: FALSE
***** Receivinng Array : ( 4, 1, 2, 3)
***** Received String_Type: "Very much longer bounded string message"
***** Received Integer_Type: 4
-- This is a scenario file describing the AADL -- This is a scenario file describing the AADL
-- application some_types -- application some_types
-- $Id: scenario.aadl 6713 2009-06-20 20:58:28Z lanarre $ -- $Id: scenario.aadl 6713 2009-06-20 20:58:28Z lanarre $
system some_types system some_types
properties properties
Ocarina_Config::Timeout_Property => 4000ms; Ocarina_Config::Timeout_Property => 5000ms;
Ocarina_Config::Referencial_Files => Ocarina_Config::Referencial_Files =>
("node_a", "node_a_native.ref", ("node_a", "node_a_native.ref",
"node_b", "node_b_native.ref"); "node_b", "node_b_native.ref");
Ocarina_Config::AADL_Files => Ocarina_Config::AADL_Files =>
("some_types.aadl", "software.aadl"); ("some_types.aadl", "software.aadl");
Ocarina_Config::Generator => polyorb_hi_ada; Ocarina_Config::Generator => polyorb_hi_ada;
Ocarina_Config::Needed_Property_Sets => Ocarina_Config::Needed_Property_Sets =>
(value (Ocarina_Config::Data_Model), (value (Ocarina_Config::Data_Model),
value (Ocarina_Config::Deployment), value (Ocarina_Config::Deployment),
value (Ocarina_Config::Cheddar_Properties)); value (Ocarina_Config::Cheddar_Properties));
...@@ -21,4 +21,3 @@ end some_types; ...@@ -21,4 +21,3 @@ end some_types;
system implementation some_types.Impl system implementation some_types.Impl
end some_types.Impl; end some_types.Impl;
...@@ -19,7 +19,7 @@ REF_OUTPUTS = $(srcdir)/sunseeker_local.ref ...@@ -19,7 +19,7 @@ REF_OUTPUTS = $(srcdir)/sunseeker_local.ref
include $(srcdir)/../../Makefile.common include $(srcdir)/../../Makefile.common
SCENARIO_FILES=$(srcdir)/scenario_dist.aadl SCENARIO_FILES=$(srcdir)/scenario_dist.aadl
CHECKABLE_SCENARIO_FILES= CHECKABLE_SCENARIO_FILES=#$(SCENARIO_FILES)
if HAS_GNATMAKE_FOR_LEON if HAS_GNATMAKE_FOR_LEON
SCENARIO_FILES+=$(srcdir)/scenario_local.aadl SCENARIO_FILES+=$(srcdir)/scenario_local.aadl
......
-- This is a scenario file describing the AADL -- This is a scenario file describing the AADL
-- application sunseeker -- application sunseeker
-- $Id: scenario_dist.aadl 6713 2009-06-20 20:58:28Z lanarre $ -- $Id: scenario_dist.aadl 6713 2009-06-20 20:58:28Z lanarre $
system sunseeker system sunseeker
properties properties
Ocarina_Config::Timeout_Property => 1000ms; Ocarina_Config::Timeout_Property => 5000ms;
Ocarina_Config::Referencial_Files => Ocarina_Config::Referencial_Files =>
("sunseekercontroller", "sunseeker_controller_native.ref", ("sunseekercontroller", "sunseeker_controller_native.ref",
"sunseekerplant", "sunseekerplant_native.ref"); "sunseekerplant", "sunseekerplant_native.ref");
Ocarina_Config::AADL_Files => Ocarina_Config::AADL_Files =>
("sunseeker.aadl", "sunseeker_dist.aadl"); ("sunseeker.aadl", "sunseeker_dist.aadl");
Ocarina_Config::Generator => polyorb_hi_ada; Ocarina_Config::Generator => polyorb_hi_ada;
Ocarina_Config::Needed_Property_Sets => Ocarina_Config::Needed_Property_Sets =>
(value (Ocarina_Config::Data_Model), (value (Ocarina_Config::Data_Model),
value (Ocarina_Config::Deployment), value (Ocarina_Config::Deployment),
value (Ocarina_Config::Cheddar_Properties)); value (Ocarina_Config::Cheddar_Properties));
...@@ -21,4 +21,3 @@ end sunseeker; ...@@ -21,4 +21,3 @@ end sunseeker;
system implementation sunseeker.Impl system implementation sunseeker.Impl
end sunseeker.Impl; end sunseeker.Impl;
...@@ -8,6 +8,7 @@ ADA_SPECS_WITH_BODY = $(srcdir)/polyorb_hi-aperiodic_task.ads \ ...@@ -8,6 +8,7 @@ ADA_SPECS_WITH_BODY = $(srcdir)/polyorb_hi-aperiodic_task.ads \
$(srcdir)/polyorb_hi-isr_task.ads \ $(srcdir)/polyorb_hi-isr_task.ads \
$(srcdir)/polyorb_hi-marshallers_g.ads \ $(srcdir)/polyorb_hi-marshallers_g.ads \
$(srcdir)/polyorb_hi-messages.ads \ $(srcdir)/polyorb_hi-messages.ads \
$(srcdir)/polyorb_hi-null_task.ads \
$(srcdir)/polyorb_hi-output.ads \ $(srcdir)/polyorb_hi-output.ads \
$(srcdir)/polyorb_hi-periodic_task.ads \ $(srcdir)/polyorb_hi-periodic_task.ads \
$(srcdir)/polyorb_hi-port_kinds.ads \ $(srcdir)/polyorb_hi-port_kinds.ads \
...@@ -16,16 +17,16 @@ ADA_SPECS_WITH_BODY = $(srcdir)/polyorb_hi-aperiodic_task.ads \ ...@@ -16,16 +17,16 @@ ADA_SPECS_WITH_BODY = $(srcdir)/polyorb_hi-aperiodic_task.ads \
$(srcdir)/polyorb_hi-suspenders.ads \ $(srcdir)/polyorb_hi-suspenders.ads \
$(srcdir)/polyorb_hi-thread_interrogators.ads \ $(srcdir)/polyorb_hi-thread_interrogators.ads \
$(srcdir)/polyorb_hi-scheduler.ads \ $(srcdir)/polyorb_hi-scheduler.ads \
$(srcdir)/polyorb_hi-time_marshallers.ads \
$(srcdir)/polyorb_hi-unprotected_queue.ads \
$(srcdir)/polyorb_hi-utils.ads $(srcdir)/polyorb_hi-utils.ads
ADA_SPECS = $(ADA_SPECS_WITH_BODY) $(srcdir)/polyorb_hi.ads \ ADA_SPECS = $(ADA_SPECS_WITH_BODY) $(srcdir)/polyorb_hi.ads \
$(srcdir)/polyorb_hi-errors.ads \ $(srcdir)/polyorb_hi-errors.ads \
$(srcdir)/polyorb_hi_generated.ads \ $(srcdir)/polyorb_hi_generated.ads \
$(srcdir)/polyorb_hi-output_low_level.ads \ $(srcdir)/polyorb_hi-output_low_level.ads \
$(srcdir)/polyorb_hi-port_type_marshallers.ads \ $(srcdir)/polyorb_hi-port_type_marshallers.ads \
$(srcdir)/polyorb_hi-streams.ads \ $(srcdir)/polyorb_hi-streams.ads \
$(srcdir)/polyorb_hi-time_marshallers.ads \
$(srcdir)/polyorb_hi-transport_low_level.ads $(srcdir)/polyorb_hi-transport_low_level.ads
ADA_BODIES = $(ADA_SPECS_WITH_BODY:.ads=.adb) \ ADA_BODIES = $(ADA_SPECS_WITH_BODY:.ads=.adb) \
......
...@@ -218,7 +218,7 @@ package body PolyORB_HI_Drivers_GRSPW is ...@@ -218,7 +218,7 @@ package body PolyORB_HI_Drivers_GRSPW is
PolyORB_HI_Generated.Transport.Deliver PolyORB_HI_Generated.Transport.Deliver
(Corresponding_Entity (Corresponding_Entity
(Integer_8 (SEA (Message_Length_Size + 1))), (Unsigned_8 (SEA (Message_Length_Size + 1))),
To_PO_HI_Full_Stream (SEA) To_PO_HI_Full_Stream (SEA)
(1 .. Stream_Element_Offset (SEO))); (1 .. Stream_Element_Offset (SEO)));
end loop Main_Loop; end loop Main_Loop;
......
...@@ -304,7 +304,7 @@ package body PolyORB_HI_Drivers_GRUART is ...@@ -304,7 +304,7 @@ package body PolyORB_HI_Drivers_GRUART is
PolyORB_HI_Generated.Transport.Deliver PolyORB_HI_Generated.Transport.Deliver
(Corresponding_Entity (Corresponding_Entity
(Integer_8 (SEA (Message_Length_Size + 1))), (Unsigned_8 (SEA (Message_Length_Size + 1))),
To_PO_HI_Full_Stream (SEA) To_PO_HI_Full_Stream (SEA)
(1 .. Stream_Element_Offset (SEO))); (1 .. Stream_Element_Offset (SEO)));
else else
......
...@@ -276,7 +276,7 @@ package body PolyORB_HI_Drivers_Native_TCP_IP is ...@@ -276,7 +276,7 @@ package body PolyORB_HI_Drivers_Native_TCP_IP is
-- Identify peer node -- Identify peer node
Node := Corresponding_Node (Integer_8 (SEC (SEC'First))); Node := Corresponding_Node (Unsigned_8 (SEC (SEC'First)));
Nodes (Node).Socket_Receive := Socket; Nodes (Node).Socket_Receive := Socket;
pragma Debug (Put_Line (Verbose, "Connection from node " pragma Debug (Put_Line (Verbose, "Connection from node "
& Node_Type'Image (Node))); & Node_Type'Image (Node)));
...@@ -365,7 +365,7 @@ package body PolyORB_HI_Drivers_Native_TCP_IP is ...@@ -365,7 +365,7 @@ package body PolyORB_HI_Drivers_Native_TCP_IP is
PolyORB_HI_Generated.Transport.Deliver PolyORB_HI_Generated.Transport.Deliver
(Corresponding_Entity (Corresponding_Entity
(Integer_8 (SEA (Message_Length_Size + 1))), (Unsigned_8 (SEA (Message_Length_Size + 1))),
To_PO_HI_Full_Stream (SEA) To_PO_HI_Full_Stream (SEA)
(1 .. Stream_Element_Offset (SEO))); (1 .. Stream_Element_Offset (SEO)));
end if; end if;
......
...@@ -324,7 +324,7 @@ package body PolyORB_HI_Drivers_Native_UART is ...@@ -324,7 +324,7 @@ package body PolyORB_HI_Drivers_Native_UART is
begin begin
PolyORB_HI_Generated.Transport.Deliver PolyORB_HI_Generated.Transport.Deliver
(Corresponding_Entity (Corresponding_Entity
(Integer_8 (SEA (Message_Length_Size + 1))), (Unsigned_8 (SEA (Message_Length_Size + 1))),
To_PO_HI_Full_Stream (SEA) To_PO_HI_Full_Stream (SEA)
(1 .. Stream_Element_Offset (SEO))); (1 .. Stream_Element_Offset (SEO)));
exception exception
......
...@@ -11,6 +11,13 @@ ...@@ -11,6 +11,13 @@
pragma Locking_Policy (Ceiling_Locking); -- D.13.1 pragma Locking_Policy (Ceiling_Locking); -- D.13.1
--------------------------------------------------------------------------------
-- Activate SPARK Mode, even if we do not actually use it on the
-- target: the code has Spark_Mode disabled in some occurences,
-- without this pragma the code would be rejected.
pragma Spark_Mode (On);
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
-- The following define restrictions to be supported by the -- The following define restrictions to be supported by the
-- PolyORB-HI, common restrictions -- PolyORB-HI, common restrictions
......
-- Ada restrictions to be supported by PolyORB HI, for native targets -- Ada restrictions to be supported by PolyORB HI, for native targets
-- pragma Profile_Warnings (Ravenscar); -- D.13.1 pragma Profile_Warnings (Ravenscar); -- D.13.1
...@@ -64,8 +64,8 @@ package body PolyORB_HI.Aperiodic_Task is ...@@ -64,8 +64,8 @@ package body PolyORB_HI.Aperiodic_Task is
(Put_Line (Put_Line
(Verbose, (Verbose,
"Aperiodic Task " "Aperiodic Task "
& Entity_Image (Entity) + Entity_Image (Entity)
& ": Wait initialization")); + ": Wait initialization"));
Suspend_Until_True (Task_Suspension_Objects (Entity)); Suspend_Until_True (Task_Suspension_Objects (Entity));
delay until System_Startup_Time; delay until System_Startup_Time;
...@@ -73,7 +73,7 @@ package body PolyORB_HI.Aperiodic_Task is ...@@ -73,7 +73,7 @@ package body PolyORB_HI.Aperiodic_Task is
pragma Debug (Put_Line pragma Debug (Put_Line
(Verbose, (Verbose,
"Aperiodic task initialized for entity " "Aperiodic task initialized for entity "
& Entity_Image (Entity))); + Entity_Image (Entity)));
-- Main task loop -- Main task loop
...@@ -83,8 +83,8 @@ package body PolyORB_HI.Aperiodic_Task is ...@@ -83,8 +83,8 @@ package body PolyORB_HI.Aperiodic_Task is
(Put_Line (Put_Line
(Verbose, (Verbose,
"Aperiodic Task " "Aperiodic Task "
& Entity_Image (Entity) + Entity_Image (Entity)
& ": New Dispatch")); + ": New Dispatch"));
-- Block until an event is received -- Block until an event is received
...@@ -94,8 +94,8 @@ package body PolyORB_HI.Aperiodic_Task is ...@@ -94,8 +94,8 @@ package body PolyORB_HI.Aperiodic_Task is
(Put_Line (Put_Line
(Verbose, (Verbose,
"Aperiodic Task " "Aperiodic Task "
& Entity_Image (Entity) + Entity_Image (Entity)
& ": received event")); + ": received event"));
-- Execute the job -- Execute the job
......
...@@ -63,8 +63,8 @@ package body PolyORB_HI.Background_Task is ...@@ -63,8 +63,8 @@ package body PolyORB_HI.Background_Task is
(Put_Line (Put_Line
(Verbose, (Verbose,
"Background Task " "Background Task "
& Entity_Image (Entity) + Entity_Image (Entity)
& ": Wait initialization")); + ": Wait initialization"));
Suspend_Until_True (Task_Suspension_Objects (Entity)); Suspend_Until_True (Task_Suspension_Objects (Entity));
delay until System_Startup_Time; delay until System_Startup_Time;
...@@ -72,14 +72,14 @@ package body PolyORB_HI.Background_Task is ...@@ -72,14 +72,14 @@ package body PolyORB_HI.Background_Task is
pragma Debug (Put_Line pragma Debug (Put_Line
(Verbose, (Verbose,
"Background task initialized for entity " "Background task initialized for entity "
& Entity_Image (Entity))); + Entity_Image (Entity)));
pragma Debug pragma Debug
(Put_Line (Put_Line
(Verbose, (Verbose,
"Background Task " "Background Task "
& Entity_Image (Entity) + Entity_Image (Entity)
& ": Run job")); + ": Run job"));
Error := Job; Error := Job;
......
...@@ -65,8 +65,8 @@ package body PolyORB_HI.Hybrid_Task is ...@@ -65,8 +65,8 @@ package body PolyORB_HI.Hybrid_Task is
(Put_Line (Put_Line
(Verbose, (Verbose,
"Hybrid Task " "Hybrid Task "
& Entity_Image (Entity) + Entity_Image (Entity)
& ": Wait initialization")); + ": Wait initialization"));
Suspend_Until_True (Task_Suspension_Objects (Entity)); Suspend_Until_True (Task_Suspension_Objects (Entity));
delay until System_Startup_Time; delay until System_Startup_Time;
...@@ -74,7 +74,7 @@ package body PolyORB_HI.Hybrid_Task is ...@@ -74,7 +74,7 @@ package body PolyORB_HI.Hybrid_Task is
pragma Debug (Put_Line pragma Debug (Put_Line
(Verbose, (Verbose,
"Hybrid task initialized for entity " "Hybrid task initialized for entity "
& Entity_Image (Entity))); + Entity_Image (Entity)));
-- Run the initialize entrypoint (if any) -- Run the initialize entrypoint (if any)
...@@ -87,8 +87,8 @@ package body PolyORB_HI.Hybrid_Task is ...@@ -87,8 +87,8 @@ package body PolyORB_HI.Hybrid_Task is
(Put_Line (Put_Line
(Verbose, (Verbose,
"Hybrid Task " "Hybrid Task "
& Entity_Image (Entity) + Entity_Image (Entity)
& ": New Dispatch")); + ": New Dispatch"));
-- Block until an event is received -- Block until an event is received