From 3cd3f84c3762165c31f7aa14374bb496718b501b Mon Sep 17 00:00:00 2001 From: msmit Date: Thu, 17 Jun 2010 08:37:32 +0000 Subject: Thu Jun 17 08:33:14 UTC 2010 Marcel Smit * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.idl: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.mpc: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.idl: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.mpc: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.h: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.cpp: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.idl: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.mpc: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.h: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.cpp: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.idl: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.mpc: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.h: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.cpp: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.idl: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.mpc: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.idl: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.mpc: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.h: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.cpp: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.idl: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.mpc: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.h: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.cpp: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.idl: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.mpc: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.h: * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.cpp: Renamed file (underscore between Shapes and Sender/Control/Receiver). --- CIAO/ChangeLog | 33 +++ .../Shapes_asm/Deployment/descriptors/Plan.cdp | 36 +-- .../ShapesControl_comp/ports/ShapesControl_obj.idl | 20 -- .../ShapesControl_comp/ports/ShapesControl_obj.mpc | 129 ---------- .../ports/Shapes_Control_obj.idl | 20 ++ .../ports/Shapes_Control_obj.mpc | 129 ++++++++++ .../ShapesControl_comp/src/ShapesControl_comp.idl | 24 -- .../ShapesControl_comp/src/ShapesControl_comp.mpc | 167 ------------- .../ShapesControl_comp/src/ShapesControl_exec.cpp | 263 --------------------- .../ShapesControl_comp/src/ShapesControl_exec.h | 111 --------- .../ShapesControl_comp/src/Shapes_Control_comp.idl | 24 ++ .../ShapesControl_comp/src/Shapes_Control_comp.mpc | 167 +++++++++++++ .../ShapesControl_comp/src/Shapes_Control_exec.cpp | 263 +++++++++++++++++++++ .../ShapesControl_comp/src/Shapes_Control_exec.h | 111 +++++++++ .../src/ShapesReceiver_comp.idl | 16 -- .../src/ShapesReceiver_comp.mpc | 166 ------------- .../src/ShapesReceiver_exec.cpp | 128 ---------- .../ShapesReceiver_comp/src/ShapesReceiver_exec.h | 80 ------- .../src/Shapes_Receiver_comp.idl | 16 ++ .../src/Shapes_Receiver_comp.mpc | 166 +++++++++++++ .../src/Shapes_Receiver_exec.cpp | 128 ++++++++++ .../ShapesReceiver_comp/src/Shapes_Receiver_exec.h | 80 +++++++ .../ShapesSender_comp/src/ShapesSender_comp.idl | 19 -- .../ShapesSender_comp/src/ShapesSender_comp.mpc | 174 -------------- .../ShapesSender_comp/src/ShapesSender_exec.cpp | 212 ----------------- .../ShapesSender_comp/src/ShapesSender_exec.h | 87 ------- .../ShapesSender_comp/src/Shapes_Sender_comp.idl | 19 ++ .../ShapesSender_comp/src/Shapes_Sender_comp.mpc | 174 ++++++++++++++ .../ShapesSender_comp/src/Shapes_Sender_exec.cpp | 212 +++++++++++++++++ .../ShapesSender_comp/src/Shapes_Sender_exec.h | 87 +++++++ 30 files changed, 1647 insertions(+), 1614 deletions(-) delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.idl delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.mpc create mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.idl create mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.mpc delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.idl delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.mpc delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.h create mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.idl create mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.mpc create mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.cpp create mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.idl delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.mpc delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.h create mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.idl create mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.mpc create mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.cpp create mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.idl delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.mpc delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.h create mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.idl create mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.mpc create mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.cpp create mode 100644 CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.h diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index a0546e10221..fca3d5982ac 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,36 @@ +Thu Jun 17 08:33:14 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.idl: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.mpc: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.idl: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.mpc: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.h: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.cpp: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.idl: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.mpc: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.h: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.cpp: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.idl: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.mpc: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.h: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.cpp: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.idl: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.mpc: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.idl: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.mpc: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.h: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.cpp: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.idl: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.mpc: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.h: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.cpp: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.idl: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.mpc: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.h: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.cpp: + Renamed file (underscore between Shapes and Sender/Control/Receiver). + Thu Jun 17 08:15:26 UTC 2010 Marcel Smit * bin/ciao_tests.lst: diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp index 0fd5f699363..e5f06657a4f 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp @@ -42,7 +42,7 @@ tk_string - ShapesReceiver_svnt + Shapes_Receiver_svnt @@ -53,7 +53,7 @@ tk_string - ShapesReceiver_exec + Shapes_Receiver_exec @@ -94,7 +94,7 @@ tk_string - ShapesControl_svnt + Shapes_Control_svnt @@ -105,7 +105,7 @@ tk_string - ShapesControl_exec + Shapes_Control_exec @@ -198,7 +198,7 @@ tk_string - ShapesSender_svnt + Shapes_Sender_svnt @@ -209,7 +209,7 @@ tk_string - ShapesSender_exec + Shapes_Sender_exec @@ -408,16 +408,16 @@ - ShapesSender_exec + Shapes_Sender_exec - ShapesSender_exec + Shapes_Sender_exec - ShapesSender_svnt + Shapes_Sender_svnt - ShapesSender_svnt + Shapes_Sender_svnt Sender_stub @@ -438,16 +438,16 @@ Shapes_conn_svnt - ShapesReceiver_exec + Shapes_Receiver_exec - ShapesReceiver_exec + Shapes_Receiver_exec - ShapesReceiver_svnt + Shapes_Receiver_svnt - ShapesReceiver_svnt + Shapes_Receiver_svnt Receiver_stub @@ -456,16 +456,16 @@ Receiver_stub - ShapesControl_exec + Shapes_Control_exec - ShapesControl_exec + Shapes_Control_exec - ShapesControl_svnt + Shapes_Control_svnt - ShapesControl_svnt + Shapes_Control_svnt Control_stub diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.idl deleted file mode 100644 index 70666866e15..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.idl +++ /dev/null @@ -1,20 +0,0 @@ -// $Id$ - -#ifndef SHAPES_CONTROL_IDL_ -#define SHAPES_CONTROL_IDL_ - -#include "Shapes_defn.idl" - -#pragma ciao lem "ShapesControl_objE.idl" - -module Shapes -{ - interface Control_obj - { - ReturnStatus setSize (in unsigned short size); - ReturnStatus setLocation (in unsigned short x, - in unsigned short y); - }; -}; - -#endif /* SHAPES_CONTROL_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.mpc deleted file mode 100644 index 7650b3769e2..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.mpc +++ /dev/null @@ -1,129 +0,0 @@ -// $Id$ - -project(ShapesControl_obj_idl_gen) : componentidldefaults { - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_STUB_Export \ - -Wb,stub_export_include=ShapesControl_obj_stub_export.h \ - -Wb,skel_export_macro=SHAPES_CONTROL_SVNT_Export \ - -Wb,skel_export_include=ShapesControl_obj_svnt_export.h \ - -Wb,svnt_export_macro=SHAPES_CONTROL_SVNT_Export \ - -Wb,svnt_export_include=ShapesControl_obj_svnt_export.h \ - -Wb,exec_export_macro=SHAPES_CONTROL_EXEC_Export \ - -Wb,exec_export_include=ShapesControl_obj_exec_export.h \ - -I../../ports \ - -o GeneratedCode - - IDL_Files { - ShapesControl_obj.idl - gendir = GeneratedCode - } -} - -project(ShapesControl_obj_lem_gen) : ciaoidldefaults { - after += ShapesControl_obj_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_LEM_STUB_Export \ - -Wb,stub_export_include=ShapesControl_obj_lem_stub_export.h \ - -SS -Gxhst \ - -I../../ports \ - -o GeneratedCode - - IDL_Files { - GeneratedCode/ShapesControl_objE.idl - gendir = GeneratedCode - } -} - -project(ShapesControl_obj_lem_stub) : ccm_svnt { - after += ShapesControl_obj_lem_gen ShapesControl_obj_stub - - libs += ShapesControl_obj_stub - libpaths += ../../lib - libout = ../../lib - - includes += ../../ports/GeneratedCode - - sharedname = ShapesControl_obj_lem_stub - dynamicflags = SHAPES_CONTROL_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/ShapesControl_objEC.cpp - } - - Header_Files { - GeneratedCode/ShapesControl_objEC.h - GeneratedCode/ShapesControl_obj_lem_stub_export.h - } - - Inline_Files { - GeneratedCode/ShapesControl_objEC.inl - } -} - -project(ShapesControl_obj_stub) : ccm_stub { - after += ShapesControl_obj_idl_gen Shapes_defn_idl_gen Shapes_defn_stub - - libs += Shapes_defn_stub - libpaths += ../../lib - libout = ../../lib - - includes += ../../ports/GeneratedCode - - sharedname = ShapesControl_obj_stub - dynamicflags = SHAPES_CONTROL_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/ShapesControl_objC.cpp - } - - Header_Files { - GeneratedCode/ShapesControl_objC.h - GeneratedCode/ShapesControl_obj_stub_export.h - } - - Inline_Files { - GeneratedCode/ShapesControl_objC.inl - } -} - - -project(ShapesControl_obj_svnt) : ciao_servant { - after += ShapesControl_obj_lem_stub ShapesControl_obj_stub \ - Shapes_defn_idl_gen Shapes_defn_stub - - libs += ShapesControl_obj_stub ShapesControl_obj_lem_stub \ - Shapes_defn_stub - libpaths += ../../lib - libout = ../../lib - - includes += ../../ports/GeneratedCode - - sharedname = ShapesControl_obj_svnt - dynamicflags = SHAPES_CONTROL_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/ShapesControl_objS.cpp - GeneratedCode/ShapesControl_obj_svnt.cpp - } - - Header_Files { - GeneratedCode/ShapesControl_objS.h - GeneratedCode/ShapesControl_obj_svnt.h - GeneratedCode/ShapesControl_obj_svnt_export.h - } - - Inline_Files { - GeneratedCode/ShapesControl_objS.inl - } -} - - diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.idl new file mode 100644 index 00000000000..aa2f6e6e318 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.idl @@ -0,0 +1,20 @@ +// $Id$ + +#ifndef SHAPES_CONTROL_IDL_ +#define SHAPES_CONTROL_IDL_ + +#include "Shapes_defn.idl" + +#pragma ciao lem "Shapes_Control_objE.idl" + +module Shapes +{ + interface Control_obj + { + ReturnStatus setSize (in unsigned short size); + ReturnStatus setLocation (in unsigned short x, + in unsigned short y); + }; +}; + +#endif /* SHAPES_CONTROL_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.mpc new file mode 100644 index 00000000000..8679c8d0e98 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/Shapes_Control_obj.mpc @@ -0,0 +1,129 @@ +// $Id$ + +project(Shapes_Control_obj_idl_gen) : componentidldefaults { + custom_only = 1 + idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_STUB_Export \ + -Wb,stub_export_include=Shapes_Control_obj_stub_export.h \ + -Wb,skel_export_macro=SHAPES_CONTROL_SVNT_Export \ + -Wb,skel_export_include=Shapes_Control_obj_svnt_export.h \ + -Wb,svnt_export_macro=SHAPES_CONTROL_SVNT_Export \ + -Wb,svnt_export_include=Shapes_Control_obj_svnt_export.h \ + -Wb,exec_export_macro=SHAPES_CONTROL_EXEC_Export \ + -Wb,exec_export_include=Shapes_Control_obj_exec_export.h \ + -I../../ports \ + -o GeneratedCode + + IDL_Files { + Shapes_Control_obj.idl + gendir = GeneratedCode + } +} + +project(Shapes_Control_obj_lem_gen) : ciaoidldefaults { + after += Shapes_Control_obj_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_LEM_STUB_Export \ + -Wb,stub_export_include=Shapes_Control_obj_lem_stub_export.h \ + -SS -Gxhst \ + -I../../ports \ + -o GeneratedCode + + IDL_Files { + GeneratedCode/Shapes_Control_objE.idl + gendir = GeneratedCode + } +} + +project(Shapes_Control_obj_lem_stub) : ccm_svnt { + after += Shapes_Control_obj_lem_gen Shapes_Control_obj_stub + + libs += Shapes_Control_obj_stub + libpaths += ../../lib + libout = ../../lib + + includes += ../../ports/GeneratedCode + + sharedname = Shapes_Control_obj_lem_stub + dynamicflags = SHAPES_CONTROL_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + GeneratedCode/Shapes_Control_objEC.cpp + } + + Header_Files { + GeneratedCode/Shapes_Control_objEC.h + GeneratedCode/Shapes_Control_obj_lem_stub_export.h + } + + Inline_Files { + GeneratedCode/Shapes_Control_objEC.inl + } +} + +project(Shapes_Control_obj_stub) : ccm_stub { + after += Shapes_Control_obj_idl_gen Shapes_defn_idl_gen Shapes_defn_stub + + libs += Shapes_defn_stub + libpaths += ../../lib + libout = ../../lib + + includes += ../../ports/GeneratedCode + + sharedname = Shapes_Control_obj_stub + dynamicflags = SHAPES_CONTROL_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + GeneratedCode/Shapes_Control_objC.cpp + } + + Header_Files { + GeneratedCode/Shapes_Control_objC.h + GeneratedCode/Shapes_Control_obj_stub_export.h + } + + Inline_Files { + GeneratedCode/Shapes_Control_objC.inl + } +} + + +project(Shapes_Control_obj_svnt) : ciao_servant { + after += Shapes_Control_obj_lem_stub Shapes_Control_obj_stub \ + Shapes_defn_idl_gen Shapes_defn_stub + + libs += Shapes_Control_obj_stub Shapes_Control_obj_lem_stub \ + Shapes_defn_stub + libpaths += ../../lib + libout = ../../lib + + includes += ../../ports/GeneratedCode + + sharedname = Shapes_Control_obj_svnt + dynamicflags = SHAPES_CONTROL_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + GeneratedCode/Shapes_Control_objS.cpp + GeneratedCode/Shapes_Control_obj_svnt.cpp + } + + Header_Files { + GeneratedCode/Shapes_Control_objS.h + GeneratedCode/Shapes_Control_obj_svnt.h + GeneratedCode/Shapes_Control_obj_svnt_export.h + } + + Inline_Files { + GeneratedCode/Shapes_Control_objS.inl + } +} + + diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.idl deleted file mode 100644 index 0c37c9c8806..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.idl +++ /dev/null @@ -1,24 +0,0 @@ -// $Id$ - -#ifndef SHAPES_CONTROL_COMP_IDL_ -#define SHAPES_CONTROL_COMP_IDL_ - -#include "ShapesControl_obj.idl" - -#include - -module Shapes -{ - component Control_comp - { - uses Shapes::Control_obj control; - - attribute unsigned long rate; - attribute unsigned short max_x; - attribute unsigned short max_y; - attribute unsigned short max_size; - attribute boolean resize_shape; - }; -}; - -#endif /* SHAPES_CONTROL_COMP_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.mpc deleted file mode 100644 index 7b14d3d06ab..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_comp.mpc +++ /dev/null @@ -1,167 +0,0 @@ -// $Id$ - -project(ShapesControl_idl_gen) : componentidldefaults { - after += ShapesControl_obj_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_COMP_STUB_Export \ - -Wb,stub_export_include=ShapesControl_stub_export.h \ - -Wb,skel_export_macro=SHAPES_CONTROL_COMP_SVNT_Export \ - -Wb,skel_export_include=ShapesControl_svnt_export.h \ - -Wb,svnt_export_macro=SHAPES_CONTROL_COMP_SVNT_Export \ - -Wb,svnt_export_include=ShapesControl_svnt_export.h \ - -Wb,exec_export_macro=SHAPES_CONTROL_COMP_EXEC_Export \ - -Wb,exec_export_include=ShapesControl_exec_export.h \ - -I../ports \ - -I../../ports \ - -o GeneratedCode - - IDL_Files { - ShapesControl_comp.idl - gendir = GeneratedCode - } -} - -project(ShapesControl_lem_gen) : ciaoidldefaults { - after += ShapesControl_idl_gen ShapesControl_obj_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_COMP_LEM_STUB_Export \ - -Wb,stub_export_include=ShapesControl_lem_stub_export.h \ - -SS -Gxhst \ - -I../ports \ - -I../ports/GeneratedCode \ - -I../../ports \ - -o GeneratedCode - - IDL_Files { - GeneratedCode/ShapesControl_compE.idl - gendir = GeneratedCode - } -} - -project(ShapesControl_lem_stub) : ccm_svnt { - after += ShapesControl_lem_gen ShapesControl_stub Shapes_msg_stub \ - ShapesControl_obj_stub - - libs += Shapes_msg_stub ShapesControl_stub ShapesControl_obj_stub - libpaths += ../../lib - libout = ../../lib - - includes += ../../ports/GeneratedCode ../ports/GeneratedCode - - sharedname = ShapesControl_lem_stub - dynamicflags = SHAPES_CONTROL_COMP_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/ShapesControl_compEC.cpp - } - - Header_Files { - GeneratedCode/ShapesControl_compEC.h - GeneratedCode/ShapesControl_lem_stub_export.h - } - - Inline_Files { - GeneratedCode/ShapesControl_compEC.inl - } -} - -project(ShapesControl_stub) : ccm_stub { - after += ShapesControl_idl_gen Shapes_msg_stub \ - ShapesControl_obj_stub ShapesControl_obj_lem_stub - - libs += Shapes_msg_stub ShapesControl_obj_stub - libpaths += ../../lib - libout = ../../lib - - includes += ../../ports/GeneratedCode ../ports/GeneratedCode - - sharedname = ShapesControl_stub - dynamicflags = SHAPES_CONTROL_COMP_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/ShapesControl_compC.cpp - } - - Header_Files { - GeneratedCode/ShapesControl_compC.h - GeneratedCode/ShapesControl_stub_export.h - } - - Inline_Files { - GeneratedCode/ShapesControl_compC.inl - } -} - -project(ShapesControl_exec) : ciao_executor { - after += ShapesControl_lem_stub ShapesControl_stub \ - ShapesControl_obj_lem_stub - - libs += ShapesControl_stub ShapesControl_lem_stub Shapes_msg_stub \ - ShapesControl_obj_lem_stub ShapesControl_obj_stub - libpaths += ../../lib - libout = ../../lib - - includes += ./GeneratedCode ../ports/GeneratedCode ../../ports/GeneratedCode - - sharedname = ShapesControl_exec - dynamicflags = SHAPES_CONTROL_COMP_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ShapesControl_exec.cpp - } - - Header_Files { - ShapesControl_exec.h - ShapesControl_exec_export.h - } - - Inline_Files { - } -} - - -project(ShapesControl_svnt) : ciao_servant { - after += Shapes_msg_stub ShapesControl_lem_stub \ - ShapesControl_stub ShapesControl_obj_svnt \ - ShapesControl_obj_lem_stub - - libs += ShapesControl_stub ShapesControl_lem_stub \ - Shapes_msg_stub \ - ShapesControl_obj_stub ShapesControl_obj_svnt \ - ShapesControl_obj_lem_stub - libpaths += ../../lib - libout = ../../lib - - includes += ../ports/GeneratedCode ../../ports/GeneratedCode - - sharedname = ShapesControl_svnt - dynamicflags = SHAPES_CONTROL_COMP_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/ShapesControl_compS.cpp - GeneratedCode/ShapesControl_comp_svnt.cpp - } - - Header_Files { - GeneratedCode/ShapesControl_compS.h - GeneratedCode/ShapesControl_comp_svnt.h - GeneratedCode/ShapesControl_svnt_export.h - } - - Inline_Files { - GeneratedCode/ShapesControl_compS.inl - } -} - diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.cpp deleted file mode 100644 index c58f5e37a20..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.cpp +++ /dev/null @@ -1,263 +0,0 @@ -// -*- C++ -*- -// $Id$ - -#include "ShapesControl_exec.h" -#include "ace/Guard_T.h" -#include "ciao/Logger/Log_Macros.h" -#include "tao/ORB_Core.h" - -namespace CIAO_Shapes_Control_comp_Impl -{ - //============================================================ - // pulse_Generator - //============================================================ - pulse_Generator::pulse_Generator (Control_exec_i &callback) - : pulse_callback_ (callback) - { - } - - pulse_Generator::~pulse_Generator () - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - this->pulse_callback_.tick (); - return 0; - } - - //============================================================ - // Control_exec_i - //============================================================ - Control_exec_i::Control_exec_i (void) - : rate_ (1), - max_x_ (100), - max_y_ (100), - max_size_ (25), - resize_ (false), - x_increasing_ (false), - y_increasing_ (false), - size_increasing_ (false), - current_size_ (ACE_OS::rand () % max_size_), - current_color_ (::Shapes::GREEN), - current_x_ (ACE_OS::rand () % max_x_), - current_y_ (ACE_OS::rand () % max_y_) - { - this->ticker_ = new pulse_Generator (*this); - } - - Control_exec_i::~Control_exec_i (void) - { - } - - // Supported operations and attributes. - - void - Control_exec_i::tick () - { - if (this->x_increasing_) - { - ++this->current_x_; - this->x_increasing_ = this->current_x_ + 1 <= this->max_x_; - } - else - { - --this->current_x_; - this->x_increasing_ = this->current_x_ - 1 < 0; - } - if (this->y_increasing_) - { - ++this->current_y_; - this->y_increasing_ = this->current_y_ + 1 <= this->max_y_; - } - else - { - --this->current_y_; - this->y_increasing_ = this->current_y_ - 1 < 0; - } - if (resize_shape ()) - { - if (this->size_increasing_) - { - ++this->current_size_; - this->size_increasing_ = this->current_size_ + 1 <= this->max_size_; - } - else - { - --this->current_size_; - this->size_increasing_ = this->current_size_ - 1 < 0; - } - } - ::Shapes::Control_obj_var control = - this->context_->get_connection_control (); - if (! ::CORBA::is_nil (control)) - { - if (control->setSize (this->current_size_) == ::Shapes::RETURN_ERROR) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Control_exec_i::tick : ") - ACE_TEXT ("Setting shapes size\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Control_exec_i::tick : ") - ACE_TEXT ("Size set to <%u>.\n"), - this->current_size_)); - } - if (control->setLocation (this->current_x_, - this->current_y_) == ::Shapes::RETURN_ERROR) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Control_exec_i::tick : ") - ACE_TEXT ("Setting shapes location\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Control_exec_i::tick : ") - ACE_TEXT ("Location set to <%u>, <%u>.\n"), - this->current_x_, - this->current_y_)); - } - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to control shapes\n"))); - } - } - - void - Control_exec_i::start (void) - { - // calculate the interval time - long const usec = 1000000 / this->rate_; - if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (0, usec), - ACE_Time_Value (0, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Control_exec_i::start : ") - ACE_TEXT ("Error scheduling timer\n"))); - } - } - - void - Control_exec_i::stop (void) - { - this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_); - delete this->ticker_; - } - - ::CORBA::ULong - Control_exec_i::rate (void) - { - return this->rate_; - } - - void - Control_exec_i::rate (::CORBA::ULong rate) - { - this->rate_ = rate; - } - - ::CORBA::UShort - Control_exec_i::max_x (void) - { - return this->max_x_; - } - - void - Control_exec_i::max_x (::CORBA::UShort max_x) - { - this->max_x_ = max_x; - } - - ::CORBA::UShort - Control_exec_i::max_y (void) - { - return this->max_y_; - } - - void - Control_exec_i::max_y (::CORBA::UShort max_y) - { - this->max_y_ = max_y; - } - - ::CORBA::UShort - Control_exec_i::max_size (void) - { - return this->max_size_; - } - - void - Control_exec_i::max_size (::CORBA::UShort max_size) - { - this->max_size_ = max_size; - } - - void - Control_exec_i::resize_shape (::CORBA::Boolean resize) - { - this->resize_ = resize; - } - - ::CORBA::Boolean - Control_exec_i::resize_shape () - { - return this->resize_; - } - - ::Shapes::CCM_Control_obj_ptr - Control_exec_i::get_control (void) - { - return ::Shapes::CCM_Control_obj::_nil (); - } - - void - Control_exec_i::set_session_context (::Components::SessionContext_ptr ctx) - { - this->context_ = - ::Shapes::CCM_Control_comp_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Control_exec_i::configuration_complete (void) - { - } - - void - Control_exec_i::ccm_activate (void) - { - this->start (); - } - - void - Control_exec_i::ccm_passivate (void) - { - this->stop (); - } - - void - Control_exec_i::ccm_remove (void) - { - } - - extern "C" SHAPES_CONTROL_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_Control_comp_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Control_exec_i); - - return retval; - } -} - diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.h deleted file mode 100644 index 2c1a8c96201..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/ShapesControl_exec.h +++ /dev/null @@ -1,111 +0,0 @@ -// -*- C++ -*- -// $Id$ - -#ifndef CIAO_CONTROL_EXEC_H_ -#define CIAO_CONTROL_EXEC_H_ - -#include "ShapesControl_compEC.h" - -#include /**/ "ShapesControl_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" -#include "ace/Reactor.h" - -namespace CIAO_Shapes_Control_comp_Impl -{ - class Control_exec_i; - - //============================================================ - // pulse_Generator - //============================================================ - class pulse_Generator : public ACE_Event_Handler - { - public: - pulse_Generator (Control_exec_i &callback); - - virtual ~pulse_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Control_exec_i &pulse_callback_; - }; - - //============================================================ - // Control_exec_i - //============================================================ - class Control_exec_i - : public virtual Control_comp_Exec, - public virtual ::CORBA::LocalObject - { - public: - Control_exec_i (void); - virtual ~Control_exec_i (void); - - ::CORBA::ULong rate (void); - - void rate (::CORBA::ULong rate); - - ::CORBA::UShort max_x (void); - - void max_x (::CORBA::UShort max_x); - - ::CORBA::UShort max_y (void); - - void max_y (::CORBA::UShort max_y); - - ::CORBA::UShort max_size (void); - - void max_size (::CORBA::UShort max_size); - - void resize_shape (::CORBA::Boolean resize); - - ::CORBA::Boolean resize_shape (void); - - virtual ::Shapes::CCM_Control_obj_ptr - get_control (void); - - virtual void set_session_context (::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - void tick (); - - private: - ::Shapes::CCM_Control_comp_Context_var context_; - - pulse_Generator * ticker_; - - ::CORBA::ULong rate_; - ::CORBA::UShort max_x_; - ::CORBA::UShort max_y_; - ::CORBA::UShort max_size_; - ::CORBA::Boolean resize_; - - bool x_increasing_; - bool y_increasing_; - bool size_increasing_; - - ::CORBA::UShort current_size_; - ::Shapes::COLOR current_color_; - ::CORBA::UShort current_x_; - ::CORBA::UShort current_y_; - - void start (void); - void stop (void); - }; - - extern "C" SHAPES_CONTROL_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_Control_comp_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.idl new file mode 100644 index 00000000000..54d154923b6 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.idl @@ -0,0 +1,24 @@ +// $Id$ + +#ifndef SHAPES_CONTROL_COMP_IDL_ +#define SHAPES_CONTROL_COMP_IDL_ + +#include "Shapes_Control_obj.idl" + +#include + +module Shapes +{ + component Control_comp + { + uses Shapes::Control_obj control; + + attribute unsigned long rate; + attribute unsigned short max_x; + attribute unsigned short max_y; + attribute unsigned short max_size; + attribute boolean resize_shape; + }; +}; + +#endif /* SHAPES_CONTROL_COMP_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.mpc new file mode 100644 index 00000000000..cbbba62e7a1 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_comp.mpc @@ -0,0 +1,167 @@ +// $Id$ + +project(Shapes_Control_idl_gen) : componentidldefaults { + after += Shapes_Control_obj_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_COMP_STUB_Export \ + -Wb,stub_export_include=Shapes_Control_stub_export.h \ + -Wb,skel_export_macro=SHAPES_CONTROL_COMP_SVNT_Export \ + -Wb,skel_export_include=Shapes_Control_svnt_export.h \ + -Wb,svnt_export_macro=SHAPES_CONTROL_COMP_SVNT_Export \ + -Wb,svnt_export_include=Shapes_Control_svnt_export.h \ + -Wb,exec_export_macro=SHAPES_CONTROL_COMP_EXEC_Export \ + -Wb,exec_export_include=Shapes_Control_exec_export.h \ + -I../ports \ + -I../../ports \ + -o GeneratedCode + + IDL_Files { + Shapes_Control_comp.idl + gendir = GeneratedCode + } +} + +project(Shapes_Control_lem_gen) : ciaoidldefaults { + after += Shapes_Control_idl_gen Shapes_Control_obj_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=SHAPES_CONTROL_COMP_LEM_STUB_Export \ + -Wb,stub_export_include=Shapes_Control_lem_stub_export.h \ + -SS -Gxhst \ + -I../ports \ + -I../ports/GeneratedCode \ + -I../../ports \ + -o GeneratedCode + + IDL_Files { + GeneratedCode/Shapes_Control_compE.idl + gendir = GeneratedCode + } +} + +project(Shapes_Control_lem_stub) : ccm_svnt { + after += Shapes_Control_lem_gen Shapes_Control_stub Shapes_msg_stub \ + Shapes_Control_obj_stub + + libs += Shapes_msg_stub Shapes_Control_stub Shapes_Control_obj_stub + libpaths += ../../lib + libout = ../../lib + + includes += ../../ports/GeneratedCode ../ports/GeneratedCode + + sharedname = Shapes_Control_lem_stub + dynamicflags = SHAPES_CONTROL_COMP_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + GeneratedCode/Shapes_Control_compEC.cpp + } + + Header_Files { + GeneratedCode/Shapes_Control_compEC.h + GeneratedCode/Shapes_Control_lem_stub_export.h + } + + Inline_Files { + GeneratedCode/Shapes_Control_compEC.inl + } +} + +project(Shapes_Control_stub) : ccm_stub { + after += Shapes_Control_idl_gen Shapes_msg_stub \ + Shapes_Control_obj_stub Shapes_Control_obj_lem_stub + + libs += Shapes_msg_stub Shapes_Control_obj_stub + libpaths += ../../lib + libout = ../../lib + + includes += ../../ports/GeneratedCode ../ports/GeneratedCode + + sharedname = Shapes_Control_stub + dynamicflags = SHAPES_CONTROL_COMP_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + GeneratedCode/Shapes_Control_compC.cpp + } + + Header_Files { + GeneratedCode/Shapes_Control_compC.h + GeneratedCode/Shapes_Control_stub_export.h + } + + Inline_Files { + GeneratedCode/Shapes_Control_compC.inl + } +} + +project(Shapes_Control_exec) : ciao_executor { + after += Shapes_Control_lem_stub Shapes_Control_stub \ + Shapes_Control_obj_lem_stub + + libs += Shapes_Control_stub Shapes_Control_lem_stub Shapes_msg_stub \ + Shapes_Control_obj_lem_stub Shapes_Control_obj_stub + libpaths += ../../lib + libout = ../../lib + + includes += ./GeneratedCode ../ports/GeneratedCode ../../ports/GeneratedCode + + sharedname = Shapes_Control_exec + dynamicflags = SHAPES_CONTROL_COMP_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Shapes_Control_exec.cpp + } + + Header_Files { + Shapes_Control_exec.h + Shapes_Control_exec_export.h + } + + Inline_Files { + } +} + + +project(Shapes_Control_svnt) : ciao_servant { + after += Shapes_msg_stub Shapes_Control_lem_stub \ + Shapes_Control_stub Shapes_Control_obj_svnt \ + Shapes_Control_obj_lem_stub + + libs += Shapes_Control_stub Shapes_Control_lem_stub \ + Shapes_msg_stub \ + Shapes_Control_obj_stub Shapes_Control_obj_svnt \ + Shapes_Control_obj_lem_stub + libpaths += ../../lib + libout = ../../lib + + includes += ../ports/GeneratedCode ../../ports/GeneratedCode + + sharedname = Shapes_Control_svnt + dynamicflags = SHAPES_CONTROL_COMP_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + GeneratedCode/Shapes_Control_compS.cpp + GeneratedCode/Shapes_Control_comp_svnt.cpp + } + + Header_Files { + GeneratedCode/Shapes_Control_compS.h + GeneratedCode/Shapes_Control_comp_svnt.h + GeneratedCode/Shapes_Control_svnt_export.h + } + + Inline_Files { + GeneratedCode/Shapes_Control_compS.inl + } +} + diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.cpp new file mode 100644 index 00000000000..ff18da3fa71 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.cpp @@ -0,0 +1,263 @@ +// -*- C++ -*- +// $Id$ + +#include "Shapes_Control_exec.h" +#include "ace/Guard_T.h" +#include "ciao/Logger/Log_Macros.h" +#include "tao/ORB_Core.h" + +namespace CIAO_Shapes_Control_comp_Impl +{ + //============================================================ + // pulse_Generator + //============================================================ + pulse_Generator::pulse_Generator (Control_exec_i &callback) + : pulse_callback_ (callback) + { + } + + pulse_Generator::~pulse_Generator () + { + } + + int + pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) + { + this->pulse_callback_.tick (); + return 0; + } + + //============================================================ + // Control_exec_i + //============================================================ + Control_exec_i::Control_exec_i (void) + : rate_ (1), + max_x_ (100), + max_y_ (100), + max_size_ (25), + resize_ (false), + x_increasing_ (false), + y_increasing_ (false), + size_increasing_ (false), + current_size_ (ACE_OS::rand () % max_size_), + current_color_ (::Shapes::GREEN), + current_x_ (ACE_OS::rand () % max_x_), + current_y_ (ACE_OS::rand () % max_y_) + { + this->ticker_ = new pulse_Generator (*this); + } + + Control_exec_i::~Control_exec_i (void) + { + } + + // Supported operations and attributes. + + void + Control_exec_i::tick () + { + if (this->x_increasing_) + { + ++this->current_x_; + this->x_increasing_ = this->current_x_ + 1 <= this->max_x_; + } + else + { + --this->current_x_; + this->x_increasing_ = this->current_x_ - 1 < 0; + } + if (this->y_increasing_) + { + ++this->current_y_; + this->y_increasing_ = this->current_y_ + 1 <= this->max_y_; + } + else + { + --this->current_y_; + this->y_increasing_ = this->current_y_ - 1 < 0; + } + if (resize_shape ()) + { + if (this->size_increasing_) + { + ++this->current_size_; + this->size_increasing_ = this->current_size_ + 1 <= this->max_size_; + } + else + { + --this->current_size_; + this->size_increasing_ = this->current_size_ - 1 < 0; + } + } + ::Shapes::Control_obj_var control = + this->context_->get_connection_control (); + if (! ::CORBA::is_nil (control)) + { + if (control->setSize (this->current_size_) == ::Shapes::RETURN_ERROR) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Control_exec_i::tick : ") + ACE_TEXT ("Setting shapes size\n"))); + } + else + { + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Control_exec_i::tick : ") + ACE_TEXT ("Size set to <%u>.\n"), + this->current_size_)); + } + if (control->setLocation (this->current_x_, + this->current_y_) == ::Shapes::RETURN_ERROR) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Control_exec_i::tick : ") + ACE_TEXT ("Setting shapes location\n"))); + } + else + { + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Control_exec_i::tick : ") + ACE_TEXT ("Location set to <%u>, <%u>.\n"), + this->current_x_, + this->current_y_)); + } + } + else + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to control shapes\n"))); + } + } + + void + Control_exec_i::start (void) + { + // calculate the interval time + long const usec = 1000000 / this->rate_; + if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer ( + this->ticker_, + 0, + ACE_Time_Value (0, usec), + ACE_Time_Value (0, usec)) == -1) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Control_exec_i::start : ") + ACE_TEXT ("Error scheduling timer\n"))); + } + } + + void + Control_exec_i::stop (void) + { + this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_); + delete this->ticker_; + } + + ::CORBA::ULong + Control_exec_i::rate (void) + { + return this->rate_; + } + + void + Control_exec_i::rate (::CORBA::ULong rate) + { + this->rate_ = rate; + } + + ::CORBA::UShort + Control_exec_i::max_x (void) + { + return this->max_x_; + } + + void + Control_exec_i::max_x (::CORBA::UShort max_x) + { + this->max_x_ = max_x; + } + + ::CORBA::UShort + Control_exec_i::max_y (void) + { + return this->max_y_; + } + + void + Control_exec_i::max_y (::CORBA::UShort max_y) + { + this->max_y_ = max_y; + } + + ::CORBA::UShort + Control_exec_i::max_size (void) + { + return this->max_size_; + } + + void + Control_exec_i::max_size (::CORBA::UShort max_size) + { + this->max_size_ = max_size; + } + + void + Control_exec_i::resize_shape (::CORBA::Boolean resize) + { + this->resize_ = resize; + } + + ::CORBA::Boolean + Control_exec_i::resize_shape () + { + return this->resize_; + } + + ::Shapes::CCM_Control_obj_ptr + Control_exec_i::get_control (void) + { + return ::Shapes::CCM_Control_obj::_nil (); + } + + void + Control_exec_i::set_session_context (::Components::SessionContext_ptr ctx) + { + this->context_ = + ::Shapes::CCM_Control_comp_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Control_exec_i::configuration_complete (void) + { + } + + void + Control_exec_i::ccm_activate (void) + { + this->start (); + } + + void + Control_exec_i::ccm_passivate (void) + { + this->stop (); + } + + void + Control_exec_i::ccm_remove (void) + { + } + + extern "C" SHAPES_CONTROL_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr + create_Shapes_Control_comp_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_NORETURN ( + retval, + Control_exec_i); + + return retval; + } +} + diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.h new file mode 100644 index 00000000000..eb008f84593 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/src/Shapes_Control_exec.h @@ -0,0 +1,111 @@ +// -*- C++ -*- +// $Id$ + +#ifndef CIAO_CONTROL_EXEC_H_ +#define CIAO_CONTROL_EXEC_H_ + +#include "Shapes_Control_compEC.h" + +#include /**/ "Shapes_Control_exec_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/LocalObject.h" +#include "ace/Reactor.h" + +namespace CIAO_Shapes_Control_comp_Impl +{ + class Control_exec_i; + + //============================================================ + // pulse_Generator + //============================================================ + class pulse_Generator : public ACE_Event_Handler + { + public: + pulse_Generator (Control_exec_i &callback); + + virtual ~pulse_Generator (); + + virtual int handle_timeout (const ACE_Time_Value &tv, + const void *arg); + private: + Control_exec_i &pulse_callback_; + }; + + //============================================================ + // Control_exec_i + //============================================================ + class Control_exec_i + : public virtual Control_comp_Exec, + public virtual ::CORBA::LocalObject + { + public: + Control_exec_i (void); + virtual ~Control_exec_i (void); + + ::CORBA::ULong rate (void); + + void rate (::CORBA::ULong rate); + + ::CORBA::UShort max_x (void); + + void max_x (::CORBA::UShort max_x); + + ::CORBA::UShort max_y (void); + + void max_y (::CORBA::UShort max_y); + + ::CORBA::UShort max_size (void); + + void max_size (::CORBA::UShort max_size); + + void resize_shape (::CORBA::Boolean resize); + + ::CORBA::Boolean resize_shape (void); + + virtual ::Shapes::CCM_Control_obj_ptr + get_control (void); + + virtual void set_session_context (::Components::SessionContext_ptr ctx); + + virtual void configuration_complete (void); + + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + virtual void ccm_remove (void); + + void tick (); + + private: + ::Shapes::CCM_Control_comp_Context_var context_; + + pulse_Generator * ticker_; + + ::CORBA::ULong rate_; + ::CORBA::UShort max_x_; + ::CORBA::UShort max_y_; + ::CORBA::UShort max_size_; + ::CORBA::Boolean resize_; + + bool x_increasing_; + bool y_increasing_; + bool size_increasing_; + + ::CORBA::UShort current_size_; + ::Shapes::COLOR current_color_; + ::CORBA::UShort current_x_; + ::CORBA::UShort current_y_; + + void start (void); + void stop (void); + }; + + extern "C" SHAPES_CONTROL_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr + create_Shapes_Control_comp_Impl (void); +} + +#endif /* ifndef */ + diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.idl deleted file mode 100644 index 7deea14c2ad..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.idl +++ /dev/null @@ -1,16 +0,0 @@ -// $Id$ - -#ifndef SHAPES_RECEIVER_COMP_IDL_ -#define SHAPES_RECEIVER_COMP_IDL_ - -#include "Shapes_conn.idl" - -module Shapes -{ - component Receiver_comp - { - port ShapesConnector::DDS_Listen info_out; - }; -}; - -#endif /* SHAPES_RECEIVER_COMP_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.mpc deleted file mode 100644 index 4d8f808cd11..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_comp.mpc +++ /dev/null @@ -1,166 +0,0 @@ -// $Id$ - -project(ShapesReceiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += Shapes_conn_idl_gen - idlflags += -Wb,stub_export_macro=SHAPES_RECEIVER_COMP_STUB_Export \ - -Wb,stub_export_include=ShapesReceiver_stub_export.h \ - -Wb,skel_export_macro=SHAPES_RECEIVER_COMP_SVNT_Export \ - -Wb,skel_export_include=ShapesReceiver_svnt_export.h \ - -Wb,svnt_export_macro=SHAPES_RECEIVER_COMP_SVNT_Export \ - -Wb,svnt_export_include=ShapesReceiver_svnt_export.h \ - -Wb,exec_export_macro=SHAPES_RECEIVER_COMP_EXEC_Export \ - -Wb,exec_export_include=ShapesReceiver_exec_export.h \ - -I../../ports \ - -o GeneratedCode - - IDL_Files { - ShapesReceiver_comp.idl - gendir = GeneratedCode - } -} - -project(ShapesReceiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += ShapesReceiver_idl_gen ShapesSender_idl_lem_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAPES_RECEIVER_COMP_LEM_STUB_Export \ - -Wb,stub_export_include=ShapesReceiver_lem_stub_export.h \ - -SS -Gxhst \ - -I../../ports \ - -I../../ports/GeneratedCode \ - -o GeneratedCode - - IDL_Files { - GeneratedCode/ShapesReceiver_compE.idl - gendir = GeneratedCode - } -} - -project(ShapesReceiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += ShapesReceiver_lem_gen ShapesReceiver_stub Shapes_conn_stub \ - Shapes_msg_stub - - libs += ShapesReceiver_stub Shapes_conn_stub Shapes_msg_stub - libpaths += ../../lib - libout = ../../lib - - includes += ../../ports/GeneratedCode - - sharedname = ShapesReceiver_lem_stub - dynamicflags = SHAPES_RECEIVER_COMP_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/ShapesReceiver_compEC.cpp - } - - Header_Files { - GeneratedCode/ShapesReceiver_compEC.h - GeneratedCode/ShapesReceiver_lem_stub_export.h - } - - Inline_Files { - GeneratedCode/ShapesReceiver_compEC.inl - } -} - -project(ShapesReceiver_stub) : ccm_stub, dds4ccm_base { - after += ShapesReceiver_idl_gen Shapes_conn_stub \ - Shapes_msg_stub Shapes_conn_lem_gen - - libs += Shapes_conn_stub Shapes_msg_stub - libpaths += ../../lib - libout = ../../lib - - includes += ../../ports/GeneratedCode - - sharedname = ShapesReceiver_stub - dynamicflags = SHAPES_RECEIVER_COMP_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/ShapesReceiver_compC.cpp - } - - Header_Files { - GeneratedCode/ShapesReceiver_compC.h - GeneratedCode/ShapesReceiver_stub_export.h - } - - Inline_Files { - GeneratedCode/ShapesReceiver_compC.inl - } -} - -project(ShapesReceiver_exec) : ciao_executor, dds4ccm_base { - after += ShapesReceiver_lem_stub ShapesReceiver_stub \ - Shapes_msg_stub Shapes_conn_stub Shapes_conn_lem_stub \ - DDS4CCM_lem_stub - - libs += ShapesReceiver_stub ShapesReceiver_lem_stub Shapes_msg_stub \ - Shapes_conn_stub Shapes_conn_lem_stub DDS4CCM_lem_stub - libpaths += ../../lib - libout = ../../lib - - includes += ./GeneratedCode ../ports/GeneratedCode ../../ports/GeneratedCode - - sharedname = ShapesReceiver_exec - dynamicflags = SHAPES_RECEIVER_COMP_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ShapesReceiver_exec.cpp - } - - Header_Files { - ShapesReceiver_exec.h - GeneratedCode/ShapesReceiver_exec_export.h - } - - Inline_Files { - } -} - - -project(ShapesReceiver_svnt) : ciao_servant, dds4ccm_base { - after += ShapesReceiver_lem_stub Shapes_msg_stub \ - Shapes_conn_stub Shapes_conn_svnt ShapesReceiver_exec \ - Shapes_conn_lem_stub DDS4CCM_lem_stub DDS4CCM_skel - - libs += ShapesReceiver_stub ShapesReceiver_lem_stub Shapes_msg_stub \ - Shapes_conn_stub Shapes_conn_svnt ShapesReceiver_exec \ - Shapes_conn_lem_stub DDS4CCM_lem_stub DDS4CCM_skel - libpaths += ../../lib - libout = ../../lib - - includes += ../ports/GeneratedCode ../../ports/GeneratedCode - - sharedname = ShapesReceiver_svnt - dynamicflags = SHAPES_RECEIVER_COMP_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/ShapesReceiver_compS.cpp - GeneratedCode/ShapesReceiver_comp_svnt.cpp - } - - Header_Files { - GeneratedCode/ShapesReceiver_compS.h - GeneratedCode/ShapesReceiver_comp_svnt.h - GeneratedCode/ShapesReceiver_svnt_export.h - } - - Inline_Files { - GeneratedCode/ShapesReceiver_compS.inl - } -} - - diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.cpp deleted file mode 100644 index f5860d3fe76..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.cpp +++ /dev/null @@ -1,128 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -#include "ShapesReceiver_exec.h" -#include "ciao/Logger/Log_Macros.h" -#include "tao/ORB_Core.h" -#include "ace/OS_NS_time.h" - -namespace CIAO_Shapes_Receiver_comp_Impl -{ - //============================================================ - // ShapeType_Listener_exec_i - //============================================================ - ShapeType_Listener_exec_i::ShapeType_Listener_exec_i (void) - { - } - - ShapeType_Listener_exec_i::~ShapeType_Listener_exec_i (void) - { - } - - // Operations from ::CCM_DDS::ShapeType_Listener - void - ShapeType_Listener_exec_i::on_many_data ( - const ::Shapes::ShapeTypeSeq & /* an_instance */, - const ::CCM_DDS::ReadInfoSeq & /* info */) - { - } - - void - ShapeType_Listener_exec_i::on_one_data ( - const ShapeType & an_instance , - const ::CCM_DDS::ReadInfo & /* info */) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ShapeType_Listener: ") - ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"), - an_instance.color.in (), - an_instance.x, - an_instance.y, - an_instance.shapesize)); - } - - //============================================================ - // Receiver_exec_i - //============================================================ - Receiver_exec_i::Receiver_exec_i (void) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes. - - // Port operations. - ::Shapes::ShapesConnector::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - return new ShapeType_Listener_exec_i (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - // Operations from Components::SessionComponent. - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::Shapes::CCM_Receiver_comp_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::CCM_DDS::DataListenerControl_var lc = - this->context_->get_connection_info_out_data_control (); - - if (::CORBA::is_nil (lc.in ())) - { - ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw CORBA::INTERNAL (); - } - - lc->mode (::CCM_DDS::ONE_BY_ONE); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - } - - void - Receiver_exec_i::ccm_remove (void) - { - } - - extern "C" SHAPES_RECEIVER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_Receiver_comp_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} - diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.h deleted file mode 100644 index e132abbe3b4..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/ShapesReceiver_exec.h +++ /dev/null @@ -1,80 +0,0 @@ -// -*- C++ -*- -// $Id$ - -#ifndef SHAPES_RECEIVER_EXEC_H_ -#define SHAPES_RECEIVER_EXEC_H_ - -#include "ShapesReceiver_compEC.h" - -#include /**/ "ShapesReceiver_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" -#include "ace/Reactor.h" - -namespace CIAO_Shapes_Receiver_comp_Impl -{ - //============================================================ - // ShapeType_Listener_exec_i - //============================================================ - class SHAPES_RECEIVER_COMP_EXEC_Export ShapeType_Listener_exec_i - : public virtual ::Shapes::ShapesConnector::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - ShapeType_Listener_exec_i (void); - virtual ~ShapeType_Listener_exec_i (void); - - virtual void - on_one_data ( - const ShapeType & an_instance, - const ::CCM_DDS::ReadInfo & info); - virtual void - on_many_data ( - const ::Shapes::ShapeTypeSeq & an_instance, - const ::CCM_DDS::ReadInfoSeq & info); - }; - - class SHAPES_RECEIVER_COMP_EXEC_Export Receiver_exec_i - : public virtual Receiver_comp_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - // Supported operations and attributes. - - // Component attributes. - - // Port operations. - virtual ::Shapes::ShapesConnector::CCM_Listener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - - // Operations from Components::SessionComponent. - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - private: - ::Shapes::CCM_Receiver_comp_Context_var context_; - }; - - extern "C" SHAPES_RECEIVER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_Receiver_comp_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.idl new file mode 100644 index 00000000000..7deea14c2ad --- /dev/null +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.idl @@ -0,0 +1,16 @@ +// $Id$ + +#ifndef SHAPES_RECEIVER_COMP_IDL_ +#define SHAPES_RECEIVER_COMP_IDL_ + +#include "Shapes_conn.idl" + +module Shapes +{ + component Receiver_comp + { + port ShapesConnector::DDS_Listen info_out; + }; +}; + +#endif /* SHAPES_RECEIVER_COMP_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.mpc new file mode 100644 index 00000000000..19e234f77aa --- /dev/null +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_comp.mpc @@ -0,0 +1,166 @@ +// $Id$ + +project(Shapes_Receiver_idl_gen) : componentidldefaults, dds4ccm { + custom_only = 1 + after += Shapes_conn_idl_gen + idlflags += -Wb,stub_export_macro=SHAPES_RECEIVER_COMP_STUB_Export \ + -Wb,stub_export_include=Shapes_Receiver_stub_export.h \ + -Wb,skel_export_macro=SHAPES_RECEIVER_COMP_SVNT_Export \ + -Wb,skel_export_include=Shapes_Receiver_svnt_export.h \ + -Wb,svnt_export_macro=SHAPES_RECEIVER_COMP_SVNT_Export \ + -Wb,svnt_export_include=Shapes_Receiver_svnt_export.h \ + -Wb,exec_export_macro=SHAPES_RECEIVER_COMP_EXEC_Export \ + -Wb,exec_export_include=Shapes_Receiver_exec_export.h \ + -I../../ports \ + -o GeneratedCode + + IDL_Files { + Shapes_Receiver_comp.idl + gendir = GeneratedCode + } +} + +project(Shapes_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { + after += Shapes_Receiver_idl_gen Shapes_Sender_idl_lem_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=SHAPES_RECEIVER_COMP_LEM_STUB_Export \ + -Wb,stub_export_include=Shapes_Receiver_lem_stub_export.h \ + -SS -Gxhst \ + -I../../ports \ + -I../../ports/GeneratedCode \ + -o GeneratedCode + + IDL_Files { + GeneratedCode/Shapes_Receiver_compE.idl + gendir = GeneratedCode + } +} + +project(Shapes_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { + after += Shapes_Receiver_lem_gen Shapes_Receiver_stub Shapes_conn_stub \ + Shapes_msg_stub + + libs += Shapes_Receiver_stub Shapes_conn_stub Shapes_msg_stub + libpaths += ../../lib + libout = ../../lib + + includes += ../../ports/GeneratedCode + + sharedname = Shapes_Receiver_lem_stub + dynamicflags = SHAPES_RECEIVER_COMP_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + GeneratedCode/Shapes_Receiver_compEC.cpp + } + + Header_Files { + GeneratedCode/Shapes_Receiver_compEC.h + GeneratedCode/Shapes_Receiver_lem_stub_export.h + } + + Inline_Files { + GeneratedCode/Shapes_Receiver_compEC.inl + } +} + +project(Shapes_Receiver_stub) : ccm_stub, dds4ccm_base { + after += Shapes_Receiver_idl_gen Shapes_conn_stub \ + Shapes_msg_stub Shapes_conn_lem_gen + + libs += Shapes_conn_stub Shapes_msg_stub + libpaths += ../../lib + libout = ../../lib + + includes += ../../ports/GeneratedCode + + sharedname = Shapes_Receiver_stub + dynamicflags = SHAPES_RECEIVER_COMP_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + GeneratedCode/Shapes_Receiver_compC.cpp + } + + Header_Files { + GeneratedCode/Shapes_Receiver_compC.h + GeneratedCode/Shapes_Receiver_stub_export.h + } + + Inline_Files { + GeneratedCode/Shapes_Receiver_compC.inl + } +} + +project(Shapes_Receiver_exec) : ciao_executor, dds4ccm_base { + after += Shapes_Receiver_lem_stub Shapes_Receiver_stub \ + Shapes_msg_stub Shapes_conn_stub Shapes_conn_lem_stub \ + DDS4CCM_lem_stub + + libs += Shapes_Receiver_stub Shapes_Receiver_lem_stub Shapes_msg_stub \ + Shapes_conn_stub Shapes_conn_lem_stub DDS4CCM_lem_stub + libpaths += ../../lib + libout = ../../lib + + includes += ./GeneratedCode ../ports/GeneratedCode ../../ports/GeneratedCode + + sharedname = Shapes_Receiver_exec + dynamicflags = SHAPES_RECEIVER_COMP_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Shapes_Receiver_exec.cpp + } + + Header_Files { + Shapes_Receiver_exec.h + GeneratedCode/Shapes_Receiver_exec_export.h + } + + Inline_Files { + } +} + + +project(Shapes_Receiver_svnt) : ciao_servant, dds4ccm_base { + after += Shapes_Receiver_lem_stub Shapes_msg_stub \ + Shapes_conn_stub Shapes_conn_svnt Shapes_Receiver_exec \ + Shapes_conn_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + + libs += Shapes_Receiver_stub Shapes_Receiver_lem_stub Shapes_msg_stub \ + Shapes_conn_stub Shapes_conn_svnt Shapes_Receiver_exec \ + Shapes_conn_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + libpaths += ../../lib + libout = ../../lib + + includes += ../ports/GeneratedCode ../../ports/GeneratedCode + + sharedname = Shapes_Receiver_svnt + dynamicflags = SHAPES_RECEIVER_COMP_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + GeneratedCode/Shapes_Receiver_compS.cpp + GeneratedCode/Shapes_Receiver_comp_svnt.cpp + } + + Header_Files { + GeneratedCode/Shapes_Receiver_compS.h + GeneratedCode/Shapes_Receiver_comp_svnt.h + GeneratedCode/Shapes_Receiver_svnt_export.h + } + + Inline_Files { + GeneratedCode/Shapes_Receiver_compS.inl + } +} + + diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.cpp new file mode 100644 index 00000000000..cf361fba097 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.cpp @@ -0,0 +1,128 @@ +// -*- C++ -*- +// +// $Id$ + +#include "Shapes_Receiver_exec.h" +#include "ciao/Logger/Log_Macros.h" +#include "tao/ORB_Core.h" +#include "ace/OS_NS_time.h" + +namespace CIAO_Shapes_Receiver_comp_Impl +{ + //============================================================ + // ShapeType_Listener_exec_i + //============================================================ + ShapeType_Listener_exec_i::ShapeType_Listener_exec_i (void) + { + } + + ShapeType_Listener_exec_i::~ShapeType_Listener_exec_i (void) + { + } + + // Operations from ::CCM_DDS::ShapeType_Listener + void + ShapeType_Listener_exec_i::on_many_data ( + const ::Shapes::ShapeTypeSeq & /* an_instance */, + const ::CCM_DDS::ReadInfoSeq & /* info */) + { + } + + void + ShapeType_Listener_exec_i::on_one_data ( + const ShapeType & an_instance , + const ::CCM_DDS::ReadInfo & /* info */) + { + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ShapeType_Listener: ") + ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"), + an_instance.color.in (), + an_instance.x, + an_instance.y, + an_instance.shapesize)); + } + + //============================================================ + // Receiver_exec_i + //============================================================ + Receiver_exec_i::Receiver_exec_i (void) + { + } + + Receiver_exec_i::~Receiver_exec_i (void) + { + } + + // Supported operations and attributes. + + // Component attributes. + + // Port operations. + ::Shapes::ShapesConnector::CCM_Listener_ptr + Receiver_exec_i::get_info_out_data_listener (void) + { + return new ShapeType_Listener_exec_i (); + } + + ::CCM_DDS::CCM_PortStatusListener_ptr + Receiver_exec_i::get_info_out_status (void) + { + return ::CCM_DDS::CCM_PortStatusListener::_nil (); + } + + // Operations from Components::SessionComponent. + void + Receiver_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->context_ = + ::Shapes::CCM_Receiver_comp_Context::_narrow (ctx); + if ( ::CORBA::is_nil (this->context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Receiver_exec_i::configuration_complete (void) + { + } + + void + Receiver_exec_i::ccm_activate (void) + { + ::CCM_DDS::DataListenerControl_var lc = + this->context_->get_connection_info_out_data_control (); + + if (::CORBA::is_nil (lc.in ())) + { + ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); + throw CORBA::INTERNAL (); + } + + lc->mode (::CCM_DDS::ONE_BY_ONE); + } + + void + Receiver_exec_i::ccm_passivate (void) + { + } + + void + Receiver_exec_i::ccm_remove (void) + { + } + + extern "C" SHAPES_RECEIVER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr + create_Shapes_Receiver_comp_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_NORETURN ( + retval, + Receiver_exec_i); + + return retval; + } +} + diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.h new file mode 100644 index 00000000000..6a4ffd7fd45 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesReceiver_comp/src/Shapes_Receiver_exec.h @@ -0,0 +1,80 @@ +// -*- C++ -*- +// $Id$ + +#ifndef SHAPES_RECEIVER_EXEC_H_ +#define SHAPES_RECEIVER_EXEC_H_ + +#include "Shapes_Receiver_compEC.h" + +#include /**/ "Shapes_Receiver_exec_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/LocalObject.h" +#include "ace/Reactor.h" + +namespace CIAO_Shapes_Receiver_comp_Impl +{ + //============================================================ + // ShapeType_Listener_exec_i + //============================================================ + class SHAPES_RECEIVER_COMP_EXEC_Export ShapeType_Listener_exec_i + : public virtual ::Shapes::ShapesConnector::CCM_Listener, + public virtual ::CORBA::LocalObject + { + public: + ShapeType_Listener_exec_i (void); + virtual ~ShapeType_Listener_exec_i (void); + + virtual void + on_one_data ( + const ShapeType & an_instance, + const ::CCM_DDS::ReadInfo & info); + virtual void + on_many_data ( + const ::Shapes::ShapeTypeSeq & an_instance, + const ::CCM_DDS::ReadInfoSeq & info); + }; + + class SHAPES_RECEIVER_COMP_EXEC_Export Receiver_exec_i + : public virtual Receiver_comp_Exec, + public virtual ::CORBA::LocalObject + { + public: + Receiver_exec_i (void); + virtual ~Receiver_exec_i (void); + + // Supported operations and attributes. + + // Component attributes. + + // Port operations. + virtual ::Shapes::ShapesConnector::CCM_Listener_ptr + get_info_out_data_listener (void); + + virtual ::CCM_DDS::CCM_PortStatusListener_ptr + get_info_out_status (void); + + // Operations from Components::SessionComponent. + virtual void + set_session_context ( + ::Components::SessionContext_ptr ctx); + + virtual void configuration_complete (void); + + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + virtual void ccm_remove (void); + + private: + ::Shapes::CCM_Receiver_comp_Context_var context_; + }; + + extern "C" SHAPES_RECEIVER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr + create_Shapes_Receiver_comp_Impl (void); +} + +#endif /* ifndef */ + diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.idl deleted file mode 100644 index a18d57bcf2d..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.idl +++ /dev/null @@ -1,19 +0,0 @@ -// $Id$ - -#ifndef SHAPES_SENDER_COMP_IDL_ -#define SHAPES_SENDER_COMP_IDL_ - -#include "Shapes_conn.idl" -#include "ShapesControl_obj.idl" - -module Shapes -{ - component Sender_comp - { - port ShapesConnector::DDS_Write info_write; - - provides Shapes::Control_obj control; - }; -}; - -#endif /* SHAPES_SENDER_COMP_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.mpc deleted file mode 100644 index 537e5223698..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_comp.mpc +++ /dev/null @@ -1,174 +0,0 @@ -// $Id$ - -project(ShapesSender_idl_gen) : componentidldefaults, dds4ccm { - after += Shapes_conn_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAPES_SENDER_COMP_STUB_Export \ - -Wb,stub_export_include=ShapesSender_stub_export.h \ - -Wb,skel_export_macro=SHAPES_SENDER_COMP_SVNT_Export \ - -Wb,skel_export_include=ShapesSender_svnt_export.h \ - -Wb,svnt_export_macro=SHAPES_SENDER_COMP_SVNT_Export \ - -Wb,svnt_export_include=ShapesSender_svnt_export.h \ - -Wb,exec_export_macro=SHAPES_SENDER_COMP_EXEC_Export \ - -Wb,exec_export_include=ShapesSender_exec_export.h \ - -I../../ports \ - -I../../ShapesControl_comp/ports \ - -o GeneratedCode - - IDL_Files { - ShapesSender_comp.idl - gendir = GeneratedCode - } -} - -project(ShapesSender_lem_gen) : ciaoidldefaults, dds4ccm { - after += ShapesSender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SHAPES_SENDER_COMP_LEM_STUB_Export \ - -Wb,stub_export_include=ShapesSender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors \ - -I../../ports \ - -I../../ports/GeneratedCode \ - -I../../ShapesControl_comp/ports \ - -I../../ShapesControl_comp/ports/GeneratedCode \ - -o GeneratedCode - - IDL_Files { - GeneratedCode/ShapesSender_compE.idl - gendir = GeneratedCode - } -} - -project(ShapesSender_lem_stub) : ccm_svnt, dds4ccm_base { - after += ShapesSender_lem_gen ShapesSender_stub Shapes_msg_stub - - libs += Shapes_msg_stub ShapesSender_stub - libpaths += ../../lib - libout = ../../lib - - includes += ../../ports/GeneratedCode ../../ShapesControl_comp/ports/GeneratedCode - - sharedname = ShapesSender_lem_stub - dynamicflags = SHAPES_SENDER_COMP_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/ShapesSender_compEC.cpp - } - - Header_Files { - GeneratedCode/ShapesSender_compEC.h - GeneratedCode/ShapesSender_lem_stub_export.h - } - - Inline_Files { - GeneratedCode/ShapesSender_compEC.inl - } -} - -project(ShapesSender_stub) : ccm_stub, dds4ccm_base { - after += ShapesSender_idl_gen Shapes_msg_stub Shapes_conn_stub - - libs += Shapes_msg_stub Shapes_conn_stub - libpaths += ../../lib - libout = ../../lib - - includes += ../../ports/GeneratedCode ../../ShapesControl_comp/ports/GeneratedCode - - sharedname = ShapesSender_stub - dynamicflags = SHAPES_SENDER_COMP_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/ShapesSender_compC.cpp - } - - Header_Files { - GeneratedCode/ShapesSender_compC.h - GeneratedCode/ShapesSender_stub_export.h - } - - Inline_Files { - GeneratedCode/ShapesSender_compC.inl - } -} - -project(ShapesSender_exec) : ciao_executor, dds4ccm_base { - after += ShapesSender_lem_stub ShapesSender_stub Shapes_conn_lem_stub \ - Shapes_conn_stub ShapesControl_lem_stub ShapesControl_obj_lem_stub \ - Shapes_defn_stub ShapesControl_obj_stub - - libs += ShapesSender_stub ShapesSender_lem_stub Shapes_msg_stub \ - Shapes_conn_lem_stub Shapes_conn_stub ShapesControl_lem_stub \ - ShapesControl_obj_lem_stub Shapes_defn_stub ShapesControl_obj_stub - libpaths += ../../lib - libout = ../../lib - - includes += ./GeneratedCode ../ports/GeneratedCode ../../ports/GeneratedCode \ - ../../ShapesControl_comp/ports/GeneratedCode - - sharedname = ShapesSender_exec - dynamicflags = SHAPES_SENDER_COMP_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ShapesSender_exec.cpp - } - - Header_Files { - ShapesSender_exec.h - ShapesSender_exec_export.h - } - - Inline_Files { - } -} - - -project(ShapesSender_svnt) : ciao_servant, dds4ccm_base { - after += Shapes_msg_stub ShapesSender_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel Shapes_conn_stub Shapes_conn_svnt \ - Shapes_conn_lem_stub ShapesControl_svnt \ - ShapesControl_obj_stub ShapesControl_obj_svnt \ - ShapesControl_obj_lem_stub - - libs += ShapesSender_stub ShapesSender_lem_stub \ - Shapes_msg_stub DDS4CCM_lem_stub DDS4CCM_skel \ - Shapes_conn_stub Shapes_conn_svnt \ - Shapes_conn_lem_stub ShapesControl_svnt \ - ShapesControl_obj_stub ShapesControl_obj_svnt \ - ShapesControl_obj_lem_stub - libpaths += ../../lib - libout = ../../lib - - includes += ../ports/GeneratedCode ../../ports/GeneratedCode \ - ../../ShapesControl_comp/ports/GeneratedCode - - sharedname = ShapesSender_svnt - dynamicflags = SHAPES_SENDER_COMP_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - GeneratedCode/ShapesSender_compS.cpp - GeneratedCode/ShapesSender_comp_svnt.cpp - } - - Header_Files { - GeneratedCode/ShapesSender_compS.h - GeneratedCode/ShapesSender_comp_svnt.h - GeneratedCode/ShapesSender_svnt_export.h - } - - Inline_Files { - GeneratedCode/ShapesSender_compS.inl - } -} - diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.cpp deleted file mode 100644 index e451a61422e..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.cpp +++ /dev/null @@ -1,212 +0,0 @@ -// -*- C++ -*- -// $Id$ - -#include "ShapesSender_exec.h" -#include "ace/Guard_T.h" -#include "ciao/Logger/Log_Macros.h" -#include "tao/ORB_Core.h" - -namespace CIAO_Shapes_Sender_comp_Impl -{ - //============================================================ - // Controller_exec_i - //============================================================ - Controller_exec_i::Controller_exec_i (Sender_exec_i &callback) - : callback_ (callback) - { - } - - Controller_exec_i::~Controller_exec_i (void) - { - } - - ::Shapes::ReturnStatus - Controller_exec_i::setSize (::CORBA::UShort size) - { - return this->callback_.setSize (size); - } - - ::Shapes::ReturnStatus - Controller_exec_i::setLocation (::CORBA::UShort x, - ::CORBA::UShort y) - { - return this->callback_.setLocation (x, y); - } - - - //============================================================ - // Sender_exec_i - //============================================================ - Sender_exec_i::Sender_exec_i (void) - : instance_handle_ (::DDS::HANDLE_NIL) - { - this->square_.x = 10; - this->square_.y = 10; - this->square_.shapesize = 1; - this->square_.color = CORBA::string_dup("GREEN"); - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - // Supported operations and attributes. - ::Shapes::CCM_Control_obj_ptr - Sender_exec_i::get_control (void) - { - return new Controller_exec_i (*this); - } - - ::Shapes::ReturnStatus - Sender_exec_i::setSize (::CORBA::UShort size) - { - this->square_.shapesize = size; - return this->update_square (); - } - - ::Shapes::ReturnStatus - Sender_exec_i::setLocation (::CORBA::UShort x, - ::CORBA::UShort y) - { - this->square_.x = x; - this->square_.y = y; - return this->update_square (); - } - - ::Shapes::ReturnStatus - Sender_exec_i::update_square () - { - ::Shapes::ShapesConnector::Writer_var writer = - this->context_->get_connection_info_write_data (); - if (::CORBA::is_nil (writer.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::update_square - ") - ACE_TEXT ("Unable to write: write_data is nil.\n"))); - return ::Shapes::RETURN_ERROR; - } - - try - { - writer->write_one (this->square_, this->instance_handle_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("UPDATED Shape_info for <%C> %u:%u:%u\n"), - this->square_.color.in (), - this->square_.x, - this->square_.y, - this->square_.shapesize)); - } - catch (const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Shape_info for <%C> not updated: <%C> didn't exist.\n"), - this->square_.color.in (), this->square_.color.in ())); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Internal Error while updating Shape_info for <%C>.\n"), - this->square_.color.in ())); - } - return ::Shapes::RETURN_OK; - } - - void - Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx) - { - this->context_ = - ::Shapes::CCM_Sender_comp_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - } - - void - Sender_exec_i::ccm_activate (void) - { - ::Shapes::ShapesConnector::Writer_var writer = - this->context_->get_connection_info_write_data (); - if (::CORBA::is_nil (writer.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::update_square - ") - ACE_TEXT ("Unable to write: write_data is nil.\n"))); - throw CORBA::INTERNAL (); - } - - try - { - this->instance_handle_ = writer->register_instance (this->square_); - //Register shape with dds. - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("REGISTER Shape_info for <%C> %u:%u:%u\n"), - this->square_.color.in (), - this->square_.x, - this->square_.y, - this->square_.shapesize)); - } - catch (const CCM_DDS::AlreadyCreated& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Shape_info for <%C> already created.\n"), - this->square_.color.in ())); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating Shape_info for <%C>.\n"), - this->square_.color.in ())); - } - } - - void - Sender_exec_i::ccm_passivate (void) - { - ::Shapes::ShapesConnector::Writer_var writer = - this->context_->get_connection_info_write_data (); - if (::CORBA::is_nil (writer.in ())) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::update_square - ") - ACE_TEXT ("Unable to write: write_data is nil.\n"))); - throw CORBA::INTERNAL (); - } - - try - { - writer->unregister_instance (this->square_, - this->instance_handle_); - } - catch (const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Shape_info for <%C> not deleted: <%C> didn't exist.\n"), - this->square_.color.in (), - this->square_.color.in ())); - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while deleting Shape_info for <%C>.\n"), - this->square_.color.in ())); - } - } - - void - Sender_exec_i::ccm_remove (void) - { - } - - extern "C" SHAPES_SENDER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_Sender_comp_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} - diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.h deleted file mode 100644 index 02c2ce1157e..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/ShapesSender_exec.h +++ /dev/null @@ -1,87 +0,0 @@ -// -*- C++ -*- -// $Id$ - -#ifndef CIAO_SENDER_EXEC_H_ -#define CIAO_SENDER_EXEC_H_ - -#include "ShapesSender_compEC.h" -#include "ShapesControl_objEC.h" - -#include /**/ "ShapesSender_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" -#include "ace/Reactor.h" - -namespace CIAO_Shapes_Sender_comp_Impl -{ - class Sender_exec_i; - - //============================================================ - // Controller_exec_i - //============================================================ - class Controller_exec_i - : public virtual ::Shapes::CCM_Control_obj, - public virtual ::CORBA::LocalObject - { - public: - Controller_exec_i (Sender_exec_i &callback); - virtual ~Controller_exec_i (void); - - virtual ::Shapes::ReturnStatus - setSize (::CORBA::UShort size); - - virtual ::Shapes::ReturnStatus - setLocation (::CORBA::UShort x, ::CORBA::UShort y); - - private: - Sender_exec_i &callback_; - }; - - //============================================================ - // Sender_exec_i - //============================================================ - class Sender_exec_i - : public virtual Sender_comp_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - virtual ::Shapes::CCM_Control_obj_ptr - get_control (void); - - virtual void set_session_context (::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - ::Shapes::ReturnStatus - setSize (::CORBA::UShort size); - - ::Shapes::ReturnStatus - setLocation (::CORBA::UShort x, ::CORBA::UShort y); - - private: - ::Shapes::CCM_Sender_comp_Context_var context_; - ::DDS::InstanceHandle_t instance_handle_; - - ShapeType square_; - - ::Shapes::ReturnStatus - update_square (void); - }; - - extern "C" SHAPES_SENDER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shapes_Sender_comp_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.idl new file mode 100644 index 00000000000..bbf97849719 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.idl @@ -0,0 +1,19 @@ +// $Id$ + +#ifndef SHAPES_SENDER_COMP_IDL_ +#define SHAPES_SENDER_COMP_IDL_ + +#include "Shapes_conn.idl" +#include "Shapes_Control_obj.idl" + +module Shapes +{ + component Sender_comp + { + port ShapesConnector::DDS_Write info_write; + + provides Shapes::Control_obj control; + }; +}; + +#endif /* SHAPES_SENDER_COMP_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.mpc new file mode 100644 index 00000000000..e36de466c99 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_comp.mpc @@ -0,0 +1,174 @@ +// $Id$ + +project(Shapes_Sender_idl_gen) : componentidldefaults, dds4ccm { + after += Shapes_conn_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=SHAPES_SENDER_COMP_STUB_Export \ + -Wb,stub_export_include=Shapes_Sender_stub_export.h \ + -Wb,skel_export_macro=SHAPES_SENDER_COMP_SVNT_Export \ + -Wb,skel_export_include=Shapes_Sender_svnt_export.h \ + -Wb,svnt_export_macro=SHAPES_SENDER_COMP_SVNT_Export \ + -Wb,svnt_export_include=Shapes_Sender_svnt_export.h \ + -Wb,exec_export_macro=SHAPES_SENDER_COMP_EXEC_Export \ + -Wb,exec_export_include=Shapes_Sender_exec_export.h \ + -I../../ports \ + -I../../ShapesControl_comp/ports \ + -o GeneratedCode + + IDL_Files { + Shapes_Sender_comp.idl + gendir = GeneratedCode + } +} + +project(Shapes_Sender_lem_gen) : ciaoidldefaults, dds4ccm { + after += Shapes_Sender_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=SHAPES_SENDER_COMP_LEM_STUB_Export \ + -Wb,stub_export_include=Shapes_Sender_lem_stub_export.h \ + -SS -Gxhst -I $CIAO_ROOT/connectors \ + -I../../ports \ + -I../../ports/GeneratedCode \ + -I../../ShapesControl_comp/ports \ + -I../../ShapesControl_comp/ports/GeneratedCode \ + -o GeneratedCode + + IDL_Files { + GeneratedCode/Shapes_Sender_compE.idl + gendir = GeneratedCode + } +} + +project(Shapes_Sender_lem_stub) : ccm_svnt, dds4ccm_base { + after += Shapes_Sender_lem_gen Shapes_Sender_stub Shapes_msg_stub + + libs += Shapes_msg_stub Shapes_Sender_stub + libpaths += ../../lib + libout = ../../lib + + includes += ../../ports/GeneratedCode ../../ShapesControl_comp/ports/GeneratedCode + + sharedname = Shapes_Sender_lem_stub + dynamicflags = SHAPES_SENDER_COMP_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + GeneratedCode/Shapes_Sender_compEC.cpp + } + + Header_Files { + GeneratedCode/Shapes_Sender_compEC.h + GeneratedCode/Shapes_Sender_lem_stub_export.h + } + + Inline_Files { + GeneratedCode/Shapes_Sender_compEC.inl + } +} + +project(Shapes_Sender_stub) : ccm_stub, dds4ccm_base { + after += Shapes_Sender_idl_gen Shapes_msg_stub Shapes_conn_stub + + libs += Shapes_msg_stub Shapes_conn_stub + libpaths += ../../lib + libout = ../../lib + + includes += ../../ports/GeneratedCode ../../ShapesControl_comp/ports/GeneratedCode + + sharedname = Shapes_Sender_stub + dynamicflags = SHAPES_SENDER_COMP_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + GeneratedCode/Shapes_Sender_compC.cpp + } + + Header_Files { + GeneratedCode/Shapes_Sender_compC.h + GeneratedCode/Shapes_Sender_stub_export.h + } + + Inline_Files { + GeneratedCode/Shapes_Sender_compC.inl + } +} + +project(Shapes_Sender_exec) : ciao_executor, dds4ccm_base { + after += Shapes_Sender_lem_stub Shapes_Sender_stub Shapes_conn_lem_stub \ + Shapes_conn_stub Shapes_Control_lem_stub Shapes_Control_obj_lem_stub \ + Shapes_defn_stub Shapes_Control_obj_stub + + libs += Shapes_Sender_stub Shapes_Sender_lem_stub Shapes_msg_stub \ + Shapes_conn_lem_stub Shapes_conn_stub Shapes_Control_lem_stub \ + Shapes_Control_obj_lem_stub Shapes_defn_stub Shapes_Control_obj_stub + libpaths += ../../lib + libout = ../../lib + + includes += ./GeneratedCode ../ports/GeneratedCode ../../ports/GeneratedCode \ + ../../ShapesControl_comp/ports/GeneratedCode + + sharedname = Shapes_Sender_exec + dynamicflags = SHAPES_SENDER_COMP_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Shapes_Sender_exec.cpp + } + + Header_Files { + Shapes_Sender_exec.h + Shapes_Sender_exec_export.h + } + + Inline_Files { + } +} + + +project(Shapes_Sender_svnt) : ciao_servant, dds4ccm_base { + after += Shapes_msg_stub Shapes_Sender_lem_stub DDS4CCM_lem_stub \ + DDS4CCM_skel Shapes_conn_stub Shapes_conn_svnt \ + Shapes_conn_lem_stub Shapes_Control_svnt \ + Shapes_Control_obj_stub Shapes_Control_obj_svnt \ + Shapes_Control_obj_lem_stub + + libs += Shapes_Sender_stub Shapes_Sender_lem_stub \ + Shapes_msg_stub DDS4CCM_lem_stub DDS4CCM_skel \ + Shapes_conn_stub Shapes_conn_svnt \ + Shapes_conn_lem_stub Shapes_Control_svnt \ + Shapes_Control_obj_stub Shapes_Control_obj_svnt \ + Shapes_Control_obj_lem_stub + libpaths += ../../lib + libout = ../../lib + + includes += ../ports/GeneratedCode ../../ports/GeneratedCode \ + ../../ShapesControl_comp/ports/GeneratedCode + + sharedname = Shapes_Sender_svnt + dynamicflags = SHAPES_SENDER_COMP_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + GeneratedCode/Shapes_Sender_compS.cpp + GeneratedCode/Shapes_Sender_comp_svnt.cpp + } + + Header_Files { + GeneratedCode/Shapes_Sender_compS.h + GeneratedCode/Shapes_Sender_comp_svnt.h + GeneratedCode/Shapes_Sender_svnt_export.h + } + + Inline_Files { + GeneratedCode/Shapes_Sender_compS.inl + } +} + diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.cpp new file mode 100644 index 00000000000..db7f93beee7 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.cpp @@ -0,0 +1,212 @@ +// -*- C++ -*- +// $Id$ + +#include "Shapes_Sender_exec.h" +#include "ace/Guard_T.h" +#include "ciao/Logger/Log_Macros.h" +#include "tao/ORB_Core.h" + +namespace CIAO_Shapes_Sender_comp_Impl +{ + //============================================================ + // Controller_exec_i + //============================================================ + Controller_exec_i::Controller_exec_i (Sender_exec_i &callback) + : callback_ (callback) + { + } + + Controller_exec_i::~Controller_exec_i (void) + { + } + + ::Shapes::ReturnStatus + Controller_exec_i::setSize (::CORBA::UShort size) + { + return this->callback_.setSize (size); + } + + ::Shapes::ReturnStatus + Controller_exec_i::setLocation (::CORBA::UShort x, + ::CORBA::UShort y) + { + return this->callback_.setLocation (x, y); + } + + + //============================================================ + // Sender_exec_i + //============================================================ + Sender_exec_i::Sender_exec_i (void) + : instance_handle_ (::DDS::HANDLE_NIL) + { + this->square_.x = 10; + this->square_.y = 10; + this->square_.shapesize = 1; + this->square_.color = CORBA::string_dup("GREEN"); + } + + Sender_exec_i::~Sender_exec_i (void) + { + } + + // Supported operations and attributes. + ::Shapes::CCM_Control_obj_ptr + Sender_exec_i::get_control (void) + { + return new Controller_exec_i (*this); + } + + ::Shapes::ReturnStatus + Sender_exec_i::setSize (::CORBA::UShort size) + { + this->square_.shapesize = size; + return this->update_square (); + } + + ::Shapes::ReturnStatus + Sender_exec_i::setLocation (::CORBA::UShort x, + ::CORBA::UShort y) + { + this->square_.x = x; + this->square_.y = y; + return this->update_square (); + } + + ::Shapes::ReturnStatus + Sender_exec_i::update_square () + { + ::Shapes::ShapesConnector::Writer_var writer = + this->context_->get_connection_info_write_data (); + if (::CORBA::is_nil (writer.in ())) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::update_square - ") + ACE_TEXT ("Unable to write: write_data is nil.\n"))); + return ::Shapes::RETURN_ERROR; + } + + try + { + writer->write_one (this->square_, this->instance_handle_); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("UPDATED Shape_info for <%C> %u:%u:%u\n"), + this->square_.color.in (), + this->square_.x, + this->square_.y, + this->square_.shapesize)); + } + catch (const CCM_DDS::NonExistent& ) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Shape_info for <%C> not updated: <%C> didn't exist.\n"), + this->square_.color.in (), this->square_.color.in ())); + } + catch (const CCM_DDS::InternalError& ) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Internal Error while updating Shape_info for <%C>.\n"), + this->square_.color.in ())); + } + return ::Shapes::RETURN_OK; + } + + void + Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx) + { + this->context_ = + ::Shapes::CCM_Sender_comp_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Sender_exec_i::configuration_complete (void) + { + } + + void + Sender_exec_i::ccm_activate (void) + { + ::Shapes::ShapesConnector::Writer_var writer = + this->context_->get_connection_info_write_data (); + if (::CORBA::is_nil (writer.in ())) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::update_square - ") + ACE_TEXT ("Unable to write: write_data is nil.\n"))); + throw CORBA::INTERNAL (); + } + + try + { + this->instance_handle_ = writer->register_instance (this->square_); + //Register shape with dds. + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("REGISTER Shape_info for <%C> %u:%u:%u\n"), + this->square_.color.in (), + this->square_.x, + this->square_.y, + this->square_.shapesize)); + } + catch (const CCM_DDS::AlreadyCreated& ) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Shape_info for <%C> already created.\n"), + this->square_.color.in ())); + } + catch (const CCM_DDS::InternalError& ) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating Shape_info for <%C>.\n"), + this->square_.color.in ())); + } + } + + void + Sender_exec_i::ccm_passivate (void) + { + ::Shapes::ShapesConnector::Writer_var writer = + this->context_->get_connection_info_write_data (); + if (::CORBA::is_nil (writer.in ())) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::update_square - ") + ACE_TEXT ("Unable to write: write_data is nil.\n"))); + throw CORBA::INTERNAL (); + } + + try + { + writer->unregister_instance (this->square_, + this->instance_handle_); + } + catch (const CCM_DDS::NonExistent& ) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Shape_info for <%C> not deleted: <%C> didn't exist.\n"), + this->square_.color.in (), + this->square_.color.in ())); + } + catch (const CCM_DDS::InternalError& ) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while deleting Shape_info for <%C>.\n"), + this->square_.color.in ())); + } + } + + void + Sender_exec_i::ccm_remove (void) + { + } + + extern "C" SHAPES_SENDER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr + create_Shapes_Sender_comp_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_NORETURN ( + retval, + Sender_exec_i); + + return retval; + } +} + diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.h new file mode 100644 index 00000000000..b56e9a0de9d --- /dev/null +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesSender_comp/src/Shapes_Sender_exec.h @@ -0,0 +1,87 @@ +// -*- C++ -*- +// $Id$ + +#ifndef CIAO_SENDER_EXEC_H_ +#define CIAO_SENDER_EXEC_H_ + +#include "Shapes_Sender_compEC.h" +#include "Shapes_Control_objEC.h" + +#include /**/ "Shapes_Sender_exec_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/LocalObject.h" +#include "ace/Reactor.h" + +namespace CIAO_Shapes_Sender_comp_Impl +{ + class Sender_exec_i; + + //============================================================ + // Controller_exec_i + //============================================================ + class Controller_exec_i + : public virtual ::Shapes::CCM_Control_obj, + public virtual ::CORBA::LocalObject + { + public: + Controller_exec_i (Sender_exec_i &callback); + virtual ~Controller_exec_i (void); + + virtual ::Shapes::ReturnStatus + setSize (::CORBA::UShort size); + + virtual ::Shapes::ReturnStatus + setLocation (::CORBA::UShort x, ::CORBA::UShort y); + + private: + Sender_exec_i &callback_; + }; + + //============================================================ + // Sender_exec_i + //============================================================ + class Sender_exec_i + : public virtual Sender_comp_Exec, + public virtual ::CORBA::LocalObject + { + public: + Sender_exec_i (void); + virtual ~Sender_exec_i (void); + + virtual ::Shapes::CCM_Control_obj_ptr + get_control (void); + + virtual void set_session_context (::Components::SessionContext_ptr ctx); + + virtual void configuration_complete (void); + + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + virtual void ccm_remove (void); + + ::Shapes::ReturnStatus + setSize (::CORBA::UShort size); + + ::Shapes::ReturnStatus + setLocation (::CORBA::UShort x, ::CORBA::UShort y); + + private: + ::Shapes::CCM_Sender_comp_Context_var context_; + ::DDS::InstanceHandle_t instance_handle_; + + ShapeType square_; + + ::Shapes::ReturnStatus + update_square (void); + }; + + extern "C" SHAPES_SENDER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr + create_Shapes_Sender_comp_Impl (void); +} + +#endif /* ifndef */ + -- cgit v1.2.1