diff options
author | Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> | 2011-11-07 13:35:36 +0000 |
---|---|---|
committer | Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> | 2011-11-07 13:35:36 +0000 |
commit | 8a2a6ac839964e570c829e1e2eb9cbda6f60a307 (patch) | |
tree | 82607c45e7b1a77670edd343d5a10d557dba6bd4 | |
parent | 114995b1d698091153a61d68e0e4ab9c06e04d67 (diff) | |
download | ATCD-8a2a6ac839964e570c829e1e2eb9cbda6f60a307.tar.gz |
Mon Nov 7 13:29:04 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl>
* bin/ciao_tests.lst:
* connectors/ami4ccm/tests/PragmaT:
* connectors/ami4ccm/tests/PragmaT/Base:
* connectors/ami4ccm/tests/PragmaT/Base/PragmaT.idl:
* connectors/ami4ccm/tests/PragmaT/Base/PragmaT.mpc:
* connectors/ami4ccm/tests/PragmaT/README:
* connectors/ami4ccm/tests/PragmaT/Receiver:
* connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.idl:
* connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.h:
* connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.cpp:
* connectors/ami4ccm/tests/PragmaT/Sender:
* connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.idl:
* connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc:
* connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h:
* connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.cpp:
* connectors/ami4ccm/tests/PragmaT/descriptors:
* connectors/ami4ccm/tests/PragmaT/descriptors/Plan.cdp:
* connectors/ami4ccm/tests/PragmaT/descriptors/run_test.pl:
Test use of new pragma's 'ami4ccm interface', 'ami4ccm receptacle' and 'ami4ccm idl'.
New pragma's work besides old ones 'ciao ami4ccm ...' .
14 files changed, 1887 insertions, 0 deletions
diff --git a/CIAO/ChangeLog.BRANCH b/CIAO/ChangeLog.BRANCH new file mode 100644 index 00000000000..c0cfb546ac1 --- /dev/null +++ b/CIAO/ChangeLog.BRANCH @@ -0,0 +1,28 @@ +Mon Nov 7 13:29:04 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + + * bin/ciao_tests.lst: + * connectors/ami4ccm/tests/PragmaT: + * connectors/ami4ccm/tests/PragmaT/Base: + * connectors/ami4ccm/tests/PragmaT/Base/PragmaT.idl: + * connectors/ami4ccm/tests/PragmaT/Base/PragmaT.mpc: + * connectors/ami4ccm/tests/PragmaT/README: + * connectors/ami4ccm/tests/PragmaT/Receiver: + * connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.idl: + * connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.h: + * connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.cpp: + * connectors/ami4ccm/tests/PragmaT/Sender: + * connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.idl: + * connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc: + * connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h: + * connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.cpp: + * connectors/ami4ccm/tests/PragmaT/descriptors: + * connectors/ami4ccm/tests/PragmaT/descriptors/Plan.cdp: + * connectors/ami4ccm/tests/PragmaT/descriptors/run_test.pl: + Test use of new pragma's 'ami4ccm interface', 'ami4ccm receptacle' and 'ami4ccm idl'. + New pragma's work besides old ones 'ciao ami4ccm ...' . + +Local Variables: +mode: change-log +add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time)) +indent-tabs-mode: nil +End: diff --git a/CIAO/bin/ciao_tests.lst b/CIAO/bin/ciao_tests.lst index 933415ed8a9..68ab0960fa1 100644 --- a/CIAO/bin/ciao_tests.lst +++ b/CIAO/bin/ciao_tests.lst @@ -44,6 +44,7 @@ TAO/CIAO/tests/Cookies/run_test.pl TAO/CIAO/connectors/tests/AMIDDS/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST TAO/CIAO/connectors/ami4ccm/examples/Quoter/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST +TAO/CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST TAO/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST TAO/CIAO/connectors/ami4ccm/tests/NoConnection/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST TAO/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.idl b/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.idl new file mode 100644 index 00000000000..e5fe28e7b47 --- /dev/null +++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.idl @@ -0,0 +1,37 @@ +// $Id$ + +#ifndef PRAGMAT_IDL +#define PRAGMAT_IDL + +#pragma ciao lem "Base/PragmaTE.idl" +#pragma ami4ccm interface "PragmaT::MyFoo" +#pragma ciao lem "Base/PragmaTAE.idl" +#pragma ami4ccm idl "Base/PragmaTA.idl" + +module PragmaT +{ + exception InternalError + { + long id; + string error_string; + }; + + // Sender/Receiver interface + interface MyFoo + { + long foo (in string in_str, out string answer) + raises (InternalError); + void hello (out long answer) + raises (InternalError); + + attribute short rw_attrib + getraises (InternalError) + setraises (InternalError); + + readonly attribute short ro_attrib + raises (InternalError); + }; +}; + +#endif + diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.mpc b/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.mpc new file mode 100644 index 00000000000..88ec25be749 --- /dev/null +++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.mpc @@ -0,0 +1,194 @@ +// $Id$ + +project(AMI_PragmaT_idl_gen) : componentidldefaults, ami, ami4ccm_stub { + custom_only = 1 + idlflags += -Wb,stub_export_macro=PRAGMAT_STUB_Export \ + -Wb,stub_export_include=PragmaT_stub_export.h \ + -Wb,skel_export_macro=PRAGMAT_SKEL_Export \ + -Wb,skel_export_include=PragmaT_skel_export.h \ + -Wb,conn_export_macro=PRAGMAT_CONN_Export \ + -Wb,conn_export_include=PragmaT_conn_export.h \ + -Wb,exec_export_macro=PRAGMAT_EXEC_Export \ + -Wb,exec_export_include=PragmaT_exec_export.h \ + -I.. -GM -Gxhcn + idlflags -= -Gsv + + IDL_Files { + PragmaT.idl + } +} + +project(AMI_PragmaT_lem_gen) : ciaoidldefaults { + after += AMI_PragmaT_idl_gen AMI_PragmaT_lema_gen + custom_only = 1 + idlflags += -Wb,export_macro=PRAGMAT_LEM_STUB_Export \ + -Wb,export_include=PragmaT_lem_stub_export.h \ + -I.. -SS -Gxhst + + IDL_Files { + PragmaTE.idl + } +} + +project(AMI_PragmaT_lema_gen) : ciaoidldefaults { + after += AMI_PragmaT_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=PRAGMAT_STUB_Export \ + -Wb,stub_export_include=PragmaT_stub_export.h \ + -Wb,conn_export_macro=PRAGMAT_CONN_Export \ + -Wb,conn_export_include=PragmaT_conn_export.h \ + -Wb,svnt_export_macro=PRAGMAT_SVNT_Export \ + -Wb,svnt_export_include=PragmaT_svnt_export.h \ + -Wb,skel_export_macro=PRAGMAT_SKEL_Export \ + -Wb,skel_export_include=PragmaT_skel_export.h \ + -I.. -Gsv -Gcn -Glem -GC -Gxhst -Gxhsv + + IDL_Files { + PragmaTA.idl + } +} + +project(AMI_PragmaT_lemae_gen) : ciaoidldefaults { + after += AMI_PragmaT_lema_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=PRAGMAT_LEM_STUB_Export \ + -Wb,stub_export_include=PragmaT_lem_stub_export.h \ + -I.. -SS + + IDL_Files { + PragmaTAE.idl + } +} + +project(AMI_PragmaT_stub) : ccm_stub, ami, ami4ccm_stub { + after += AMI_PragmaT_lem_gen + libs += + libout = ../lib + libpaths += ../lib + includes += .. + + sharedname = PragmaT_stub + dynamicflags += PRAGMAT_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + PragmaTC.cpp + PragmaTAC.cpp + } + + Header_Files { + PragmaTC.h + PragmaT_stub_export.h +} + + Inline_Files { + PragmaTC.inl + } +} + +project(AMI_PragmaT_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub { + after += AMI_PragmaT_lem_gen AMI_PragmaT_stub AMI_PragmaT_lemae_gen AMI_PragmaT_skel + libs += PragmaT_stub PragmaT_skel + libout = ../lib + libpaths += ../lib + includes += .. + + sharedname = PragmaT_lem_stub + dynamicflags += PRAGMAT_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + PragmaTEC.cpp + PragmaTAEC.cpp + } + + Header_Files { + PragmaTEC.h + PragmaT_lem_stub_export.h +} + + Inline_Files { + PragmaTEC.inl + } +} + +project(AMI_PragmaT_skel) : ciao_executor, ami, ami4ccm_servant { + after += AMI_PragmaT_stub + sharedname = PragmaT_skel + libs += PragmaT_stub + libout = ../lib + libpaths += ../lib + includes += .. + + dynamicflags += PRAGMAT_SKEL_BUILD_DLL + + IDL_Files { + } + + Source_Files { + PragmaTS.cpp + PragmaTAS.cpp + } + + Header_Files { + PragmaTS.h + PragmaT_skel_export.h + } + + Inline_Files { + PragmaTS.inl + } +} + +project(AMI_PragmaT_conn) : ciao_executor, ami, ami4ccm_lem_stub { + after += AMI_PragmaT_lem_stub PragmaT_Base_AMI_stub AMI_PragmaT_skel AMI_PragmaT_lema_gen AMI_PragmaT_lemae_gen + sharedname = PragmaT_conn + libs += PragmaT_stub PragmaT_skel PragmaT_lem_stub + libpaths += ../lib + libout = ../lib + dynamicflags += PRAGMAT_CONN_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + PragmaTA_conn.cpp + } + + Header_Files { + PragmaTA_conn.h + PragmaT_conn_export.h + } + + Inline_Files { + } +} + +project(AMI_PragmaT_svnt) : ciao_servant, ami, ami4ccm_servant { + after += AMI_PragmaT_lem_stub PragmaT_Base_AMI_stub AMI_PragmaT_skel AMI_PragmaT_lema_gen AMI_PragmaT_lemae_gen AMI_PragmaT_conn + sharedname = PragmaT_svnt + libs += PragmaT_stub PragmaT_skel PragmaT_lem_stub PragmaT_conn + libpaths += ../lib + libout = ../lib + dynamicflags += PRAGMAT_SVNT_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + PragmaTA_svnt.cpp + } + + Header_Files { + PragmaTA_svnt.h + PragmaTA_svnt_export.h + } + + Inline_Files { + } +} + diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/README b/CIAO/connectors/ami4ccm/tests/PragmaT/README new file mode 100644 index 00000000000..dfec218aa19 --- /dev/null +++ b/CIAO/connectors/ami4ccm/tests/PragmaT/README @@ -0,0 +1,9 @@ +// $Id$ + +This test is used to test the use of the new pragma's. + +Instead of '#PRAGMA ciao ami4ccm interface' , '#PRAGMA ciao ami4ccm receptacle' and +'#PRAGMA ciao ami4ccm idl' the new pragma's, according to the ami4ccm spec are used: +'#PRAGMA ami4ccm interface' , '#PRAGMA ami4ccm receptacle' and +'#PRAGMA ami4ccm idl' + diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.idl b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.idl new file mode 100644 index 00000000000..792408478db --- /dev/null +++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.idl @@ -0,0 +1,18 @@ +// $Id$ + +#ifndef PRAGMAT_RECEIVER_IDL +#define PRAGMAT_RECEIVER_IDL + +#include <Components.idl> + +#include "Base/PragmaT.idl" + +module PragmaT +{ + component Receiver + { + /// Provides + provides MyFoo do_my_foo; + }; +}; +#endif diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.cpp new file mode 100644 index 00000000000..e15a17020ae --- /dev/null +++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.cpp @@ -0,0 +1,166 @@ +// -*- C++ -*- +// $Id$ + +#include "PragmaT_Receiver_exec.h" +#include "ace/OS_NS_unistd.h" + +namespace CIAO_PragmaT_Receiver_Impl +{ + MyFoo_exec_i::MyFoo_exec_i ( + ::PragmaT::CCM_Receiver_Context_ptr ctx) + : ciao_context_ ( + ::PragmaT::CCM_Receiver_Context::_duplicate (ctx)), + get_rw_ (false), + get_ro_ (false) + { + } + + MyFoo_exec_i::~MyFoo_exec_i (void) + { + } + + ::CORBA::Long + MyFoo_exec_i::foo (const char * in_str, ::CORBA::String_out answer) + { + if (ACE_OS::strlen (in_str) == 0) + { + PragmaT::InternalError ex (42, "PragmaT world"); + throw ex; + } + else + { + ACE_OS::sleep (ACE_OS::rand () % 2); + answer = CORBA::string_dup ("This is my answer : Hi"); + return ACE_OS::rand () % 100; + } + } + + void + MyFoo_exec_i::hello (::CORBA::Long_out answer) + { + ACE_OS::sleep (ACE_OS::rand () % 2); + answer = ACE_OS::rand () % 100; + } + + ::CORBA::Short + MyFoo_exec_i::rw_attrib () + { + if (this->get_rw_) + { + this->get_rw_ = false; + PragmaT::InternalError ex (42, "PragmaT world"); + throw ex; + } + else + { + ACE_OS::sleep (ACE_OS::rand () % 2); + this->get_rw_ = true; + } + return ACE_OS::rand () % 100; + } + + void + MyFoo_exec_i::rw_attrib (::CORBA::Short new_value) + { + if (new_value == 0) + { + PragmaT::InternalError ex (42, "PragmaT world"); + throw ex; + } + else + { + ACE_OS::sleep (ACE_OS::rand () % 2); + } + } + + CORBA::Short + MyFoo_exec_i::ro_attrib () + { + if (this->get_ro_) + { + this->get_ro_ = false; + PragmaT::InternalError ex (42, "PragmaT world"); + throw ex; + } + else + { + ACE_OS::sleep (ACE_OS::rand () % 2); + this->get_ro_ = true; + } + return ACE_OS::rand () % 100; + } + + Receiver_exec_i::Receiver_exec_i (void) + { + } + + Receiver_exec_i::~Receiver_exec_i (void) + { + } + + ::PragmaT::CCM_MyFoo_ptr + Receiver_exec_i::get_do_my_foo (void) + { + if ( ::CORBA::is_nil (this->ciao_do_my_foo_.in ())) + { + MyFoo_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + MyFoo_exec_i ( + this->context_.in ()), + ::PragmaT::CCM_MyFoo::_nil ()); + + this->ciao_do_my_foo_ = tmp; + } + + return + ::PragmaT::CCM_MyFoo::_duplicate ( + this->ciao_do_my_foo_.in ()); + } + + void + Receiver_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->context_ = ::PragmaT::CCM_Receiver_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) + { + } + + void + Receiver_exec_i::ccm_passivate (void) + { + } + + void + Receiver_exec_i::ccm_remove (void) + { + } + + extern "C" ::Components::EnterpriseComponent_ptr + create_PragmaT_AMI_Receiver_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_RETURN ( + retval, + Receiver_exec_i, + ::Components::EnterpriseComponent::_nil ()); + + return retval; + } +} diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.h new file mode 100644 index 00000000000..3288bf5f75b --- /dev/null +++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.h @@ -0,0 +1,70 @@ +// -*- C++ -*- +// $Id$ + +#ifndef CIAO_PRAGMAT_RECEIVER_EXEC_H_ +#define CIAO_PRAGMAT_RECEIVER_EXEC_H_ + +#include "PragmaT_ReceiverEC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/LocalObject.h" +#include "PragmaT_Receiver_exec_export.h" + +namespace CIAO_PragmaT_Receiver_Impl +{ + class MyFoo_exec_i + : public virtual ::PragmaT::CCM_MyFoo, + public virtual ::CORBA::LocalObject + { + public: + MyFoo_exec_i (::PragmaT::CCM_Receiver_Context_ptr ctx); + virtual ~MyFoo_exec_i (void); + + virtual ::CORBA::Long foo (const char * in_str, ::CORBA::String_out answer); + + virtual void hello (::CORBA::Long_out answer); + + virtual ::CORBA::Short rw_attrib (); + + virtual void rw_attrib (::CORBA::Short new_value); + + virtual CORBA::Short ro_attrib (); + private: + ::PragmaT::CCM_Receiver_Context_var ciao_context_; + bool get_rw_; + bool get_ro_; + }; + + class Receiver_exec_i + : public virtual Receiver_Exec, + public virtual ::CORBA::LocalObject + { + public: + Receiver_exec_i (void); + virtual ~Receiver_exec_i (void); + + virtual ::PragmaT::CCM_MyFoo_ptr get_do_my_foo (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); + + private: + ::PragmaT::CCM_Receiver_Context_var context_; + ::PragmaT::CCM_MyFoo_var ciao_do_my_foo_; + + }; + + extern "C" PRAGMAT_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_PragmaT_AMI_Receiver_Impl (void); +} + +#endif /* ifndef */ + diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.idl b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.idl new file mode 100644 index 00000000000..79ca9f86b33 --- /dev/null +++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.idl @@ -0,0 +1,21 @@ +// $Id$ + +#ifndef PRAGMAT_SENDER_IDL +#define PRAGMAT_SENDER_IDL + +#include <Components.idl> + +#include "Base/PragmaT.idl" + +#pragma ami4ccm receptacle "PragmaT::Sender::run_my_foo" + +module PragmaT +{ + component Sender + { + /// For synchronous invocation + uses MyFoo run_my_foo; + }; +}; + +#endif diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc new file mode 100644 index 00000000000..e36424442e3 --- /dev/null +++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc @@ -0,0 +1,135 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p PragmaT_Base PragmaT_Sender" + +project(AMI_PragmaT_Base_PragmaT_Sender_idl_gen) : componentidldefaults { + after += AMI_PragmaT_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=PRAGMAT_SENDER_STUB_Export \ + -Wb,stub_export_include=PragmaT_Sender_stub_export.h \ + -Wb,skel_export_macro=PRAGMAT_SENDER_SVNT_Export \ + -Wb,skel_export_include=PragmaT_Sender_svnt_export.h \ + -Wb,exec_export_macro=PRAGMAT_SENDER_EXEC_Export \ + -Wb,exec_export_include=PragmaT_Sender_exec_export.h \ + -I.. -GC + + IDL_Files { + PragmaT_Sender.idl + } +} + +project(AMI_PragmaT_Base_PragmaT_Sender_lem_gen) : ciaoidldefaults { + after += AMI_PragmaT_Base_PragmaT_Sender_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=PRAGMAT_SENDER_LEM_STUB_Export \ + -Wb,stub_export_include=PragmaT_Sender_lem_stub_export.h \ + -SS -Gxhst -I.. + + IDL_Files { + PragmaT_SenderE.idl + } +} + +project(AMI_PragmaT_Base_PragmaT_Sender_lem_stub) : ccm_svnt, ami { + after += AMI_PragmaT_Base_PragmaT_Sender_lem_gen AMI_PragmaT_stub Conn_PragmaT_Base_stub + libs += PragmaT_stub + libpaths += ../lib + libout = ../lib + sharedname = PragmaT_Sender_lem_stub + dynamicflags += PRAGMAT_SENDER_LEM_STUB_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + PragmaT_SenderEC.cpp + } + + Header_Files { + PragmaT_SenderEC.h + PragmaT_Sender_lem_stub_export.h + } + + Inline_Files { + PragmaT_SenderEC.inl + } +} + +project(AMI_PragmaT_Base_PragmaT_Sender_stub) : ccm_stub, ami { + after += AMI_PragmaT_Base_PragmaT_Sender_idl_gen AMI_PragmaT_Base_stub AMI_PragmaT_stub Conn_PragmaT_Base_stub + libs += PragmaT_stub + libpaths += ../lib + libout = ../lib + sharedname = PragmaT_Sender_stub + dynamicflags += PRAGMAT_SENDER_STUB_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + PragmaT_SenderC.cpp + } + + Header_Files { + PragmaT_SenderC.h + PragmaT_Sender_stub_export.h + } + + Inline_Files { + PragmaT_SenderC.inl + } +} + +project(AMI_PragmaT_Base_PragmaT_Sender_exec) : ciao_executor, ami, ami4ccm_stub { + after += AMI_PragmaT_Base_PragmaT_Sender_lem_stub AMI_PragmaT_Base_PragmaT_Sender_stub AMI_PragmaT_Base_exec Conn_PragmaT_Base_stub AMI_PragmaT_lem_stub + sharedname = PragmaT_Sender_exec + libs += PragmaT_Sender_stub PragmaT_Sender_lem_stub PragmaT_stub PragmaT_stub PragmaT_lem_stub + libpaths += ../lib + libout = ../lib + dynamicflags += PRAGMAT_SENDER_EXEC_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + PragmaT_Sender_exec.cpp + } + + Header_Files { + PragmaT_Sender_exec.h + PragmaT_Sender_exec_export.h + } + + Inline_Files { + } +} + +project(AMI_PragmaT_Base_PragmaT_Sender_svnt) : ciao_servant, ami { + after += AMI_PragmaT_Base_skel AMI_PragmaT_Base_PragmaT_Sender_lem_stub AMI_PragmaT_Base_PragmaT_Sender_stub AMI_PragmaT_Base_exec AMI_PragmaT_skel + sharedname = PragmaT_Sender_svnt + libs += PragmaT_Sender_stub PragmaT_Sender_lem_stub \ + PragmaT_skel \ + PragmaT_stub + libpaths += ../lib + libout = ../lib + dynamicflags += PRAGMAT_SENDER_SVNT_BUILD_DLL + includes += .. + IDL_Files { + } + + Source_Files { + PragmaT_SenderS.cpp + PragmaT_Sender_svnt.cpp + } + + Header_Files { + PragmaT_SenderS.h + PragmaT_Sender_svnt.h + PragmaT_Sender_svnt_export.h + } + + Inline_Files { + PragmaT_SenderS.inl + } +} + + diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.cpp new file mode 100644 index 00000000000..a52de2e9d1b --- /dev/null +++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.cpp @@ -0,0 +1,400 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ + +#include "PragmaT_Sender_exec.h" + +#include "ace/OS_NS_unistd.h" + +namespace CIAO_PragmaT_Sender_Impl +{ + void HandleException ( + long id, + const char* error_string, + const char* func) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (%C) :\tCallback except from AMI.\n"), + func)); + if (id != 42) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT("ERROR (%C) :\tReceived unexpected ID received") + ACE_TEXT(" in except handler.\n"), + func)); + return; + } + if (ACE_OS::strcmp (error_string, "PragmaT world") != 0) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT("ERROR (%C) :\tReceived unexpected error string") + ACE_TEXT(" received in except handler.\n"), + func)); + return; + } + } + + void HandleException ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder, + const char* func) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (%C) :\tHandle except AMI\n"), func)); + try + { + excep_holder->raise_exception (); + } + catch (const PragmaT::InternalError& ex) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender: Caught the correct except type") + ACE_TEXT(" <%u> <%C>\n"), + ex.id, ex.error_string.in ())); + HandleException (ex.id, ex.error_string.in (), func); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("ERROR: Caught unexpected except:"); + } + } + + //============================================================ + // Worker thread for asynchronous invocations for MyFoo + //============================================================ + asynch_foo_generator::asynch_foo_generator ( + ::PragmaT::CCM_Sender_Context_ptr context) + : context_(::PragmaT::CCM_Sender_Context::_duplicate (context)) + { + } + + int asynch_foo_generator::svc () + { + ACE_OS::sleep (3); + ::PragmaT::AMI4CCM_MyFoo_var my_foo_ami_ = + context_->get_connection_sendc_run_my_foo(); + + if (CORBA::is_nil (my_foo_ami_)) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT("ERROR Sender (ASYNCH) :") + ACE_TEXT("\tfoo_ami is NIL !!!\n"))); + return 1; + } + ::PragmaT::CCM_AMI4CCM_MyFooReplyHandler_var cb = + new AMI4CCM_MyFooReplyHandler_run_my_foo_i (); + + for (int i = 0; i < 5; ++i) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (ASYNCH) :") + ACE_TEXT("\tInvoke Asynchronous calls\n"))); + my_foo_ami_->sendc_foo (cb.in (), + "Do something asynchronous"); + my_foo_ami_->sendc_hello (cb.in ()); + my_foo_ami_->sendc_get_rw_attrib(cb.in ()); + my_foo_ami_->sendc_get_rw_attrib(cb.in ()); + my_foo_ami_->sendc_set_rw_attrib(cb.in (), 15); + my_foo_ami_->sendc_get_ro_attrib(cb.in ()); + my_foo_ami_->sendc_get_ro_attrib(cb.in ()); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (ASYNCH) :\tInvoked Asynchronous calls\n"))); + } + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (ASYNCH) :\tInvoke Asynchronous calls ") + ACE_TEXT("to test except handling\n"))); + my_foo_ami_->sendc_foo (cb.in (), ""); + my_foo_ami_->sendc_set_rw_attrib(cb.in (), 0); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (ASYNCH) :\tInvoked Asynchronous call.\n"))); + return 0; + } + + //============================================================ + // Worker thread for synchronous invocations for MyFoo + //============================================================ + synch_foo_generator::synch_foo_generator ( + ::PragmaT::CCM_Sender_Context_ptr context) + : context_(::PragmaT::CCM_Sender_Context::_duplicate (context)) + { + } + + int synch_foo_generator::svc () + { + ACE_OS::sleep (3); + ::PragmaT::MyFoo_var my_foo_ami_ = + context_->get_connection_run_my_foo (); + + //run synch calls + CORBA::String_var out_str; + for (int i = 0; i < 5; ++i) + { + CORBA::Long result = my_foo_ami_->foo ("Do something synchronous", + out_str.out ()); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call (FOO)") + ACE_TEXT(" result <%u> answer <%C>\n"), result, out_str.in ())); + + CORBA::Long answer; + my_foo_ami_->hello (answer); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") + ACE_TEXT("(PRAGMAT) answer <%u>\n"), answer)); + + try + { + CORBA::Short rw_attrib = my_foo_ami_->rw_attrib (); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") + ACE_TEXT("(GET_RW_ATTRIB) answer <%u>\n"), rw_attrib)); + } + catch (const PragmaT::InternalError& ex) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (SYNCH FOO) :\tExpected Except caught :") + ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ())); + } + + try + { + my_foo_ami_->rw_attrib (15); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") + ACE_TEXT("(SET_RW_ATTRIB) to <15>\n"))); + } + catch (const PragmaT::InternalError& ex) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (SYNCH FOO) :\tExpected Except caught :") + ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ())); + } + + try + { + CORBA::Short ro_attrib = my_foo_ami_->ro_attrib (); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") + ACE_TEXT("(GET_RO_ATTRIB) answer <%u>\n"), ro_attrib)); + } + catch (const PragmaT::InternalError& ex) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (SYNCH FOO) :\tExpected Except caught :") + ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ())); + } + } + try + { + CORBA::Long result = my_foo_ami_->foo ("", out_str.out ()); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (SYNCH) :\tInvoked synchronous call result ") + ACE_TEXT("<%u> answer <%C>\n"), result, out_str.in ())); + } + catch (const PragmaT::InternalError& ex) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (SYNCH FOO) :\tExpected Except caught : ") + ACE_TEXT("<%u> <%C>\n"), ex.id, ex.error_string.in ())); + } + try + { + my_foo_ami_->rw_attrib (0); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (SYNCH) :\tInvoked synchronous call rw_attrib\n"))); + } + catch (const PragmaT::InternalError& ex) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (SYNCH RW_ATTRIB) :\tExpected Except caught :") + ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ())); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("ERROR: Caught unexpected except:"); + } + return 0; + } + + //============================================================ + // Component Executor Implementation Class: Sender_exec_i + //============================================================ + Sender_exec_i::Sender_exec_i (void) + { + } + + Sender_exec_i::~Sender_exec_i (void) + { + } + + // Supported operations and attributes. + + // Component attributes. + + // Port operations. + // Operations from Components::SessionComponent. + + void + Sender_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->context_ = + ::PragmaT::CCM_Sender_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) + { + this->asynch_foo_gen_ = + new asynch_foo_generator (this->context_.in ()); + this->asynch_foo_gen_->activate (THR_NEW_LWP | THR_JOINABLE, 1); + this->synch_foo_gen_ = + new synch_foo_generator (this->context_.in()); + this->synch_foo_gen_->activate (THR_NEW_LWP | THR_JOINABLE, 1); + } + + void + Sender_exec_i::ccm_passivate (void) + { + } + + void + Sender_exec_i::ccm_remove (void) + { + delete this->asynch_foo_gen_; + this->asynch_foo_gen_ = 0; + delete this->synch_foo_gen_; + this->synch_foo_gen_ = 0; + } + + AMI4CCM_MyFooReplyHandler_run_my_foo_i::AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) + { + } + + AMI4CCM_MyFooReplyHandler_run_my_foo_i::~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void) + { + } + + void + AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo ( + ::CORBA::Long ami_return_val, + const char * answer) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (FOO) :\tCallback from AMI: result <%u> ") + ACE_TEXT("answer <%C>\n"), ami_return_val, answer)); + } + + void + AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder) + { + HandleException (excep_holder, "FOO"); + } + + void + AMI4CCM_MyFooReplyHandler_run_my_foo_i::hello ( + ::CORBA::Long answer) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (FOO) :\tCallback from AMI (PRAGMAT) :") + ACE_TEXT(" answer <%u>\n"), answer)); + } + + void + AMI4CCM_MyFooReplyHandler_run_my_foo_i::hello_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder) + { + HandleException (excep_holder, "PRAGMAT"); + } + + void + AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_rw_attrib ( + ::CORBA::Short ami_return_val) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (RW_ATTRIB) :\tCallback from AMI (RW_ATTRIB):") + ACE_TEXT(" answer <%u>\n"), ami_return_val)); + } + + void + AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_rw_attrib_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder) + { + HandleException (excep_holder, "GET RW_ATTRIB"); + } + + void + AMI4CCM_MyFooReplyHandler_run_my_foo_i::set_rw_attrib (void) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (RW_ATTRIB) :\tCallback from ") + ACE_TEXT("AMI (RW_ATTRIB)\n"))); + } + + void + AMI4CCM_MyFooReplyHandler_run_my_foo_i::set_rw_attrib_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder) + { + HandleException (excep_holder, "SET_RW_ATTRIB"); + } + + void + AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_ro_attrib ( + ::CORBA::Short ro_attrib) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("Sender (RO_ATTRIB) :\tCallback from AMI ") + ACE_TEXT("(RO_ATTRIB) : answer <%u>\n"), ro_attrib)); + } + + void + AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_ro_attrib_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder) + { + HandleException (excep_holder, "RO_ATTRIB"); + } + + extern "C" PRAGMAT_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_PragmaT_Sender_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_NORETURN ( + retval, + Sender_exec_i); + + return retval; + } +} diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h new file mode 100644 index 00000000000..024e09e6af4 --- /dev/null +++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h @@ -0,0 +1,190 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ +#ifndef CIAO_PRAGMAT_SENDER_EXEC_JDPMZZ_H_ +#define CIAO_PRAGMAT_SENDER_EXEC_JDPMZZ_H_ + +#include /**/ "ace/pre.h" + +#include "PragmaT_SenderEC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "PragmaT_Sender_exec_export.h" +#include "tao/LocalObject.h" +#include "ace/Task.h" + +namespace CIAO_PragmaT_Sender_Impl +{ + /// Common exception handlers + void HandleException ( + long id, + const char* error_string, + const char* func); + + void HandleException ( + ::Messaging::ExceptionHolder * excep_holder, + const char* func); + + /// Worker thread for asynchronous invocations + class asynch_foo_generator : public virtual ACE_Task_Base + { + public: + asynch_foo_generator (::PragmaT::CCM_Sender_Context_ptr context); + + virtual int svc (void); + + private: + ::PragmaT::CCM_Sender_Context_var context_; + }; + + /// Worker thread for synchronous invocations + class synch_foo_generator : public virtual ACE_Task_Base + { + public: + synch_foo_generator (::PragmaT::CCM_Sender_Context_ptr context); + + virtual int svc (void); + + private: + ::PragmaT::CCM_Sender_Context_var context_; + }; + + /** + * Component Executor Implementation Class: Sender_exec_i + */ + + class Sender_exec_i + : public virtual Sender_Exec, + public virtual ::CORBA::LocalObject + { + public: + Sender_exec_i (void); + virtual ~Sender_exec_i (void); + + //@{ + /** Supported operations and attributes. */ + + //@} + + //@{ + /** Component attributes and port operations. */ + //@} + + //@{ + /** 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); + //@} + + //@{ + /** User defined public operations. */ + + //@} + + private: + ::PragmaT::CCM_Sender_Context_var ciao_context_; + + //@{ + /** Component attributes. */ + //@} + + //@{ + /** User defined members. */ + + //@} + + //@{ + /** User defined private operations. */ + private: + ::PragmaT::CCM_Sender_Context_var context_; + asynch_foo_generator* asynch_foo_gen_; + synch_foo_generator* synch_foo_gen_; + + //@} + }; + + class AMI4CCM_MyFooReplyHandler_run_my_foo_i + : public ::PragmaT::CCM_AMI4CCM_MyFooReplyHandler, + public virtual ::CORBA::LocalObject + { + public: + AMI4CCM_MyFooReplyHandler_run_my_foo_i (void); + virtual ~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void); + + virtual void + foo ( + ::CORBA::Long ami_return_val, + const char * answer); + + virtual void + foo_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder); + + virtual void + hello ( + ::CORBA::Long answer); + + virtual void + hello_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder); + + virtual void + get_rw_attrib ( + ::CORBA::Short rw_attrib); + + virtual void + get_rw_attrib_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder); + + virtual void + set_rw_attrib (void); + + virtual void + set_rw_attrib_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder); + + virtual void + get_ro_attrib ( + ::CORBA::Short ro_attrib); + + virtual void + get_ro_attrib_excep ( + ::CCM_AMI::ExceptionHolder_ptr excep_holder); + }; + + extern "C" PRAGMAT_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_PragmaT_Sender_Impl (void); + } + +#include /**/ "ace/post.h" + +#endif /* ifndef */ diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/Plan.cdp new file mode 100644 index 00000000000..3c9817b56f0 --- /dev/null +++ b/CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/Plan.cdp @@ -0,0 +1,374 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no" ?> +<!-- $Id$ --> +<Deployment:DeploymentPlan xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + + <UUID>6D382DAE-9024-4C4D-B91B-A0F9176AFACF</UUID> + + <implementation xmi:id="PragmaT_ReceiverHomeImplementation"> + <name>PragmaT_ReceiverHomeImplementation</name> + <source/> + <artifact xmi:idref="PragmaT_Receiver_ExecArtifact"/> + <artifact xmi:idref="PragmaT_Receiver_SvntArtifact"/> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_PragmaT_AMI_Receiver_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>PragmaT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_PragmaT_Receiver_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>PragmaT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="PragmaT_SenderHomeImplementation"> + <name>PragmaT_SenderHomeImplementation</name> + <source/> + <artifact xmi:idref="PragmaT_Sender_ExecArtifact"/> + <artifact xmi:idref="PragmaT_Sender_SvntArtifact"/> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_PragmaT_Sender_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>PragmaT.ImplementationArtifacts.SenderArtifacts.Sender_exec</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_PragmaT_Sender_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>PragmaT.ImplementationArtifacts.SenderArtifacts.Sender_svnt</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="PragmaT_AMIHomeImplementation"> + <name>PragmaT_AMIHomeImplementation</name> + <source/> + <artifact xmi:idref="PragmaT_AMI_ExecArtifact"/> + <artifact xmi:idref="PragmaT_AMI_SvntArtifact"/> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_PragmaT_AMI4CCM_MyFoo_Connector_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>PragmaT.ImplementationArtifacts.AMIArtifacts.AMI_exec</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_PragmaT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>PragmaT.ImplementationArtifacts.AMIArtifacts.AMI_svnt</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.Receiver"> + <name>PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.Receiver</name> + <node>Receiver</node> + <source/> + <implementation xmi:idref="PragmaT_ReceiverHomeImplementation"/> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver.ior</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.Sender"> + <name>PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.Sender</name> + <node>Sender</node> + <source/> + <implementation xmi:idref="PragmaT_SenderHomeImplementation"/> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender.ior</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.AMI"> + <name>PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.AMI</name> + <node>Sender</node> + <source/> + <implementation xmi:idref="PragmaT_AMIHomeImplementation"/> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>AMI.ior</string> + </value> + </value> + </configProperty> + </instance> + + <connection> + <name>run_asynch_foo_connection</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>sendc_run_my_foo</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.Sender" /> + </internalEndpoint> + <internalEndpoint> + <portName>ami4ccm_port_ami4ccm_provides</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.AMI" /> + </internalEndpoint> + </connection> + + <connection> + <name>do_foo_connection</name> + <internalEndpoint> + <portName>do_my_foo</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.Receiver" /> + </internalEndpoint> + <internalEndpoint> + <portName>ami4ccm_port_ami4ccm_uses</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.AMI" /> + </internalEndpoint> + </connection> + + <connection> + <name>synch_foo_connection</name> + <internalEndpoint> + <portName>do_my_foo</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.Receiver" /> + </internalEndpoint> + <internalEndpoint> + <portName>run_my_foo</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.Sender" /> + </internalEndpoint> + </connection> + + <artifact xmi:id="PragmaT_AMI_SvntArtifact"> + <name>PragmaT.ImplementationArtifacts.AMIArtifacts.AMI_svnt</name> + <source/> + <node/> + <location>PragmaT_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_PragmaT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="PragmaT_AMI_ExecArtifact"> + <name>PragmaT.ImplementationArtifacts.AMIArtifacts.AMI_exec</name> + <source/> + <node/> + <location>PragmaT_conn</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_PragmaT_AMI4CCM_MyFoo_Connector_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="PragmaT_Receiver_SvntArtifact"> + <name>PragmaT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</name> + <source/> + <node/> + <location>PragmaT_Receiver_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_PragmaT_AMI_ReceiverHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="PragmaT_Receiver_ExecArtifact"> + <name>PragmaT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec</name> + <source/> + <node/> + <location>PragmaT_Receiver_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_PragmaT_AMI_ReceiverHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="PragmaT_Sender_SvntArtifact"> + <name>PragmaT.ImplementationArtifacts.SenderArtifacts.Sender_svnt</name> + <source/> + <node/> + <location>PragmaT_Sender_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_PragmaT_AMI_SenderHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact xmi:id="PragmaT_Sender_ExecArtifact"> + <name>PragmaT.ImplementationArtifacts.SenderArtifacts.Sender_exec</name> + <source/> + <node/> + <location>PragmaT_Sender_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_PragmaT_AMI_SenderHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + +</Deployment:DeploymentPlan> diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/run_test.pl new file mode 100755 index 00000000000..cb636637db2 --- /dev/null +++ b/CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/run_test.pl @@ -0,0 +1,244 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{'ACE_ROOT'}/bin"; +use PerlACE::TestTarget; + +$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; +$TAO_ROOT = "$ENV{'TAO_ROOT'}"; +$DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; + +$daemons_running = 0; +$em_running = 0; +$ns_running = 0; + +$nr_daemon = 2; +@ports = ( 60000, 60001 ); +@iorbases = ( "Sender.ior", "Receiver.ior"); +@iorfiles = 0; +@nodenames = ( "Sender", "Receiver" ); + +# ior files other than daemon +$ior_nsbase = "ns.ior"; +$ior_nsfile = 0; +$ior_embase = "EM.ior"; +$ior_emfile = 0; + +# Processes +$E = 0; +$EM = 0; +$NS = 0; +@DEAMONS = 0; + +# targets +@tg_daemons = 0; +$tg_naming = 0; +$tg_exe_man = 0; +$tg_executor = 0; + +$status = 0; +$cdp_file = "Plan.cdp"; + +sub create_targets { + # naming service + $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; + $tg_naming->AddLibPath ('../lib'); + # daemon + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n"; + $tg_daemons[$i]->AddLibPath ('../lib'); + } + # execution manager + $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; + $tg_exe_man->AddLibPath ('../lib'); + # executor (plan_launcher) + $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; + $tg_executor->AddLibPath ('../lib'); +} + +sub init_ior_files { + $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase); + $ior_emfile = $tg_exe_man->LocalFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } + delete_ior_files (); +} + +# Delete if there are any .ior files. +sub delete_ior_files { + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i]->DeleteFile ($iorbases[$i]); + } + $tg_naming->DeleteFile ($ior_nsbase); + $tg_exe_man->DeleteFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } +} + +sub kill_node_daemon { + for ($i = 0; $i < $nr_daemon; ++$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } +} + +sub kill_open_processes { + if ($daemons_running == 1) { + kill_node_daemon (); + } + + if ($em_running == 1) { + $EM->Kill (); $EM->TimedWait (1); + } + + if ($ns_running == 1) { + $NS->Kill (); $NS->TimedWait (1); + } + # in case shutdown did not perform as expected + $tg_executor->KillAll ('dance_locality_manager'); +} + +sub run_node_daemons { + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorbase = $iorbases[$i]; + $iorfile = $iorfiles[$i]; + $port = $ports[$i]; + $nodename = $nodenames[$i]; + $iiop = "iiop://localhost:$port"; + $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; + + $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; + $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService"; + + print "Run dance_node_manager with $d_param\n"; + + $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param); + $DEAMONS[$i]->Spawn (); + + if ($tg_daemons[$i]->WaitForFileTimed($iorbase, + $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior $iorfile file of node daemon $i could not be found\n"; + for (; $i >= 0; --$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } + return -1; + } + } + return 0; +} + +create_targets (); +init_ior_files (); + +# Invoke naming service + +$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); + +print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; + +$ns_status = $NS->Spawn (); + +if ($ns_status != 0) { + print STDERR "ERROR: Unable to execute the naming service\n"; + kill_open_processes (); + exit 1; +} + +if ($tg_naming->WaitForFileTimed ($ior_nsbase, + $tg_naming->ProcessStartWaitInterval ()) == -1) { + print STDERR "ERROR: cannot find naming service IOR file\n"; + $NS->Kill (); $NS->TimedWait (1); + exit 1; +} + +$ns_running = 1; +# Set up NamingService environment +$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService"; + +# Invoke node daemon. +print "Invoking node daemon\n"; +$status = run_node_daemons (); + +if ($status != 0) { + print STDERR "ERROR: Unable to execute the node daemon\n"; + kill_open_processes (); + exit 1; +} + +$daemons_running = 1; + +# Invoke execution manager. +print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; +$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", + "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} + +if ($tg_exe_man->WaitForFileTimed ($ior_embase, + $tg_exe_man->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior file of execution manager could not be found\n"; + kill_open_processes (); + exit 1; +} + +$em_running = 1; + +# Invoke executor - start the application -. +print "Invoking executor - launch the application -\n"; + +print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-x $cdp_file -k file://$ior_emfile"); + +$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +for ($i = 0; $i < $nr_daemon; ++$i) { + if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], + $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) { + print STDERR "ERROR: The ior file of daemon $i could not be found\n"; + kill_open_processes (); + exit 1; + } +} + +print "Sleeping 90 seconds to allow task to complete\n"; +sleep (90); + +# Invoke executor - stop the application -. +print "Invoking executor - stop the application -\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; + +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-k file://$ior_emfile -x $cdp_file -s"); +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +print "Executor returned.\n"; +print "Shutting down rest of the processes.\n"; + +delete_ior_files (); +kill_open_processes (); + +exit $status; |