diff options
Diffstat (limited to 'CIAO/connectors/dds4ccm/tests/MultipleTemp')
17 files changed, 0 insertions, 2860 deletions
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl deleted file mode 100644 index cd0486eba27..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl +++ /dev/null @@ -1,36 +0,0 @@ -/** - * @file MultipleTemp_Base.idl - * @author Marijke Hengstmengel - */ - -#ifndef MULTIPLE_TEMP_BASE_IDL -#define MULTIPLE_TEMP_BASE_IDL - -#pragma ndds typesupport "Base/MultipleTemp_BaseSupport.h" -#pragma opendds typesupport "Base/MultipleTemp_BaseSupportImpl.h" - -#pragma DCPS_DATA_TYPE "TestTopicOne" -#pragma DCPS_DATA_KEY "TestTopicOne keyOne" -#pragma DCPS_DATA_TYPE "TestTopicTwo" -#pragma DCPS_DATA_KEY "TestTopicTwo keyTwo" - - -struct TestTopicOne { - string keyOne; //@key - long x; -}; - -struct TestTopicTwo { - string keyTwo; //@key - long y; - long z; -}; - -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence<TestTopicOne> TestTopicOneSeq; -#endif -#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED -typedef sequence<TestTopicTwo> TestTopicTwoSeq; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.mpc deleted file mode 100644 index 0b0e2cc5639..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.mpc +++ /dev/null @@ -1,25 +0,0 @@ -project (DDS_MultipleTemp_Base_stub) : taoidldefaults, dds4ccm_ts_default { - requires += dummy_label - sharedname = DDS_MultipleTemp_Base_stub - dynamicflags += MULTIPLE_TEMP_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=MULTIPLE_TEMP_BASE_STUB_Export \ - -Wb,stub_export_include=MultipleTemp_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - MultipleTemp_Base.idl - } - - opendds_ts_flags += --export=MULTIPLE_TEMP_BASE_STUB_Export - - DDSGenerator_Files { - MultipleTemp_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl deleted file mode 100644 index 4ce01c01aaa..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl +++ /dev/null @@ -1,21 +0,0 @@ -/** - * @file MultipleTemp_Connector.idl - * @author Marijke Hengstmengel - */ - -#ifndef MULTIPLE_TEMP_CONNECTOR_IDL_ -#define MULTIPLE_TEMP_CONNECTOR_IDL_ - -#include <Components.idl> -#include <Connector/ccm_dds_mlt.idl> - -#include "Base/MultipleTemp_Base.idl" - -#pragma ciao lem "Connector/MultipleTemp_ConnectorE.idl" - -module MultipleTemp -{ - module ::CCM_DDS::Duplex_Typed < ::TestTopicOne, ::TestTopicOneSeq, ::TestTopicTwo, ::TestTopicTwoSeq> MultipleTempConnector; -}; - -#endif /* MULTIPLE_TEMP_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc deleted file mode 100644 index 06b2767a604..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc +++ /dev/null @@ -1,166 +0,0 @@ -project (DDS_MLT_idl_gen) : taoidldefaults, anytypecode, dds4ccm { - requires += dummy_label - custom_only = 1 - idlflags += -Wb,stub_export_macro=CCM_DDS_MLT_STUB_Export \ - -Wb,stub_export_include=ccm_dds_mlt_stub_export.h \ - -Wb,skel_export_macro=CCM_DDS_MLT_SKEL_Export \ - -Wb,skel_export_include=ccm_dds_mlt_skel_export.h \ - -SS -Scc -Sci -Gxhst \ - -I $(CIAO_ROOT)/connectors/dds4ccm/idl - - IDL_Files { - ccm_dds_mlt.idl - } -} - -project(DDS_MT_TEMP_Connector_idl_gen) : connectoridldefaults, dds4ccm { - requires += dummy_label - after += DDS4CCM_idl_gen DDS_MLT_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=MULTIPLE_TEMP_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=MultipleTemp_Connector_stub_export.h \ - -Wb,skel_export_macro=MULTIPLE_TEMP_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=MultipleTemp_Connector_svnt_export.h \ - -Wb,svnt_export_macro=MULTIPLE_TEMP_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=MultipleTemp_Connector_svnt_export.h \ - -Wb,conn_export_macro=MULTIPLE_TEMP_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=MultipleTemp_Connector_conn_export.h \ - -I .. - - IDL_Files { - MultipleTemp_Connector.idl - } -} - -project(DDS_MT_TEMP_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - requires += dummy_label - custom_only = 1 - after += DDS_MT_TEMP_Connector_idl_gen - idlflags += -Wb,stub_export_macro=MULTIPLE_TEMP_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=MultipleTemp_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - MultipleTemp_ConnectorE.idl - } -} - -project(DDS_MT_TEMP_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - requires += dummy_label - after += DDS_MT_TEMP_Connector_lem_gen DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub - libs += DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_MT_TEMP_Connector_lem_stub - dynamicflags += MULTIPLE_TEMP_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultipleTemp_ConnectorEC.cpp - } - - Header_Files { - MultipleTemp_ConnectorEC.h - MultipleTemp_Connector_lem_stub_export.h - } - - Inline_Files { - MultipleTemp_ConnectorEC.inl - } -} - -project(DDS_MultipleTemp_Connector_stub) : ccm_stub, dds4ccm_base { - requires += dummy_label - after += DDS_MT_TEMP_Connector_idl_gen DDS_MultipleTemp_Base_stub - libs += DDS_MultipleTemp_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = DDS_MultipleTemp_Connector_stub - dynamicflags += MULTIPLE_TEMP_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultipleTemp_ConnectorC.cpp - } - - Header_Files { - MultipleTemp_ConnectorC.h - MultipleTemp_Connector_stub_export.h - } - - Inline_Files { - MultipleTemp_ConnectorC.inl - } -} - -project(DDS_MultipleTemp_Connector_exec) : ciao_executor, dds4ccm_impl { - requires += dummy_label - after += DDS_MT_TEMP_Connector_lem_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub - sharedname = DDS_MultipleTemp_Connector_exec - libs += DDS_MultipleTemp_Connector_stub DDS_MT_TEMP_Connector_lem_stub DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += MULTIPLE_TEMP_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Template_Files{ - MultipleTemp_Connector_T.cpp - } - - Source_Files { - MultipleTemp_Connector_conn.cpp - } - - Header_Files { - MultipleTemp_Connector_conn.h - MultipleTemp_Connector_conn_export.h - MultipleTemp_Connector_T.h - } - - Inline_Files { - } -} - - -project(DDS_MT_Connector_svnt) : ciao_servant, dds4ccm_impl { - requires += dummy_label - after += DDS_MT_TEMP_Connector_lem_stub DDS_MultipleTemp_Connector_exec DDS_MultipleTemp_Connector_stub - sharedname = DDS_MultipleTemp_Connector_svnt - libs += DDS_MultipleTemp_Connector_stub \ - DDS_MT_TEMP_Connector_lem_stub \ - DDS_MultipleTemp_Base_stub \ - DDS_MultipleTemp_Connector_exec - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += MULTIPLE_TEMP_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultipleTemp_ConnectorS.cpp - MultipleTemp_Connector_svnt.cpp - } - - Header_Files { - MultipleTemp_ConnectorS.h - MultipleTemp_Connector_svnt.h - MultipleTemp_Connector_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp deleted file mode 100644 index 4b4f467b572..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp +++ /dev/null @@ -1,517 +0,0 @@ -#include "connectors/dds4ccm/impl/DDS_Base_Connector_T.h" -#include "ace/Reactor.h" - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::FooConnector_Connector_T(void) - : push_consumer_t_ (), - push_consumer_y_ (), - reactor_ (0) -{ -} - - -/** - * Type registration both topics - **/ -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::register_type ( - ::DDS::DomainParticipant_ptr participant, - const char * /*typesupport_name*/) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::register_type"); - - ::DDS::ReturnCode_t retcode_t = ::DDS::RETCODE_OK; - ::DDS::ReturnCode_t retcode_y = ::DDS::RETCODE_OK; -#if (CIAO_DDS4CCM_NDDS==1) - ::CIAO::NDDS::DDS_DomainParticipant_i *part = - dynamic_cast< CIAO::NDDS::DDS_DomainParticipant_i * > (participant); - if (!part) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_MultipleTemp_FooConnector_T::register_type - " - "Unable to cast the DomainParticipant proxy to its internal " - "representation.\n")); - throw ::CORBA::INTERNAL (); - } - - typedef ::CIAO::NDDS::DDS_TypeFactory_T <DDS_TYPE_T, SEQ_TYPE_T> dds_type_factory_t; - typedef ::CIAO::NDDS::DDS_TypeFactory_T <DDS_TYPE_Y, SEQ_TYPE_Y> dds_type_factory_y; - - ::CIAO::NDDS::DDS_TypeFactory_i * factory_t = 0; - ::CIAO::NDDS::DDS_TypeFactory_i * factory_y = 0; - - const char* typesupport_name_t = DDS_TYPE_T::type_support::get_type_name (); - const char* typesupport_name_y = DDS_TYPE_Y::type_support::get_type_name (); - - - ACE_NEW_THROW_EX (factory_t, - dds_type_factory_t (), - ::CORBA::NO_MEMORY ()); - ::CIAO::NDDS::DDS_TypeSupport_i::register_type (typesupport_name_t, - factory_t, participant); - - ACE_NEW_THROW_EX (factory_y, - dds_type_factory_y (), - ::CORBA::NO_MEMORY ()); - - ::CIAO::NDDS::DDS_TypeSupport_i::register_type (typesupport_name_y, - factory_y, participant); - - retcode_t = DDS_TYPE_T::type_support::register_type( - part->get_rti_entity (), typesupport_name_t); - - retcode_y = DDS_TYPE_Y::type_support::register_type( - part->get_rti_entity (), typesupport_name_y); - -#endif - if ((retcode_t != ::DDS::RETCODE_OK) && (retcode_y != ::DDS::RETCODE_OK)) - { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_MultipleTemp_FooConnector_T::register_type - " - "Error registering type T <%C> and type Y <%C>\n", - ::CIAO::DDS4CCM::translate_retcode (retcode_t),::CIAO::DDS4CCM::translate_retcode (retcode_y))); - throw ::CCM_DDS::InternalError (retcode_t, 0); - } -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::unregister_type ( - ::DDS::DomainParticipant_ptr participant, - const char * typesupport_name) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::unregister_type"); -#if (CIAO_DDS4CCM_NDDS==1) - ::CIAO::NDDS::DDS_TypeFactory_i * factory = - ::CIAO::NDDS::DDS_TypeSupport_i::unregister_type (typesupport_name, participant); - delete factory; -#else - ACE_UNUSED_ARG (participant); - ACE_UNUSED_ARG (typesupport_name); -#endif - -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -char * -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::topic_name_t (void) -{ - return CORBA::string_dup (this->topic_name_t_.in ()); -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::topic_name_t ( - const char * topic_name_t) -{ - this->topic_name_t_ = topic_name_t; -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -::CCM_DDS::CCM_ContentFilterSetting * -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_t_filter_config(void) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_t_filter_config"); - this->push_consumer_t_.set_component (this); - return this->push_consumer_t_.get_filter_config (); -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -::CCM_DDS::QueryFilter * -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::push_consumer_t_filter (void) -{ - return this->push_consumer_t_.filter (); -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::push_consumer_t_filter ( - const ::CCM_DDS::QueryFilter &filter) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::push_consumer_t_filter"); - this->push_consumer_t_.filter (filter); -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -typename CCM_TYPE::push_consumer_t_traits::data_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_t_data (void) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_t_data"); - this->push_consumer_t_.set_component (this); - return this->push_consumer_t_.get_data (); -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -typename CCM_TYPE::push_consumer_t_traits::data_control_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_t_data_control (void) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_t_data_control"); - this->push_consumer_t_.set_component (this); - return this->push_consumer_t_.get_data_control (); -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -typename CCM_TYPE::push_consumer_t_traits::dds_entity_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_t_dds_entity (void) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_t_dds_entity"); - this->push_consumer_t_.set_component (this); - return this->push_consumer_t_.get_dds_entity (); -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -typename CCM_TYPE::observable_t_traits::data_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_observable_t_data (void) -{ -// return CCM_TYPE::observable_t_traits::data_type::_nil(); - this->observable_t_.set_component (this); - return this->observable_t_.get_data (); -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -typename CCM_TYPE::observable_t_traits::dds_entity_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_observable_t_dds_entity (void) -{ - this->observable_t_.set_component (this); - return this->observable_t_.get_dds_entity (); -} - -// Y -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -char * -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::topic_name_y (void) -{ - return CORBA::string_dup (this->topic_name_y_.in ()); -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::topic_name_y ( - const char * topic_name_y) -{ - this->topic_name_y_ = topic_name_y; -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -::CCM_DDS::CCM_ContentFilterSetting* -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_y_filter_config(void) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_y_filter_config"); - this->push_consumer_y_.set_component (this); - return this->push_consumer_y_.get_filter_config (); -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -::CCM_DDS::QueryFilter * - FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::push_consumer_y_filter (void) -{ - return this->push_consumer_y_.filter (); -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::push_consumer_y_filter ( - const ::CCM_DDS::QueryFilter &filter) -{ - this->push_consumer_y_.filter (filter); -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -typename CCM_TYPE::push_consumer_y_traits::data_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_y_data (void) -{ - this->push_consumer_y_.set_component (this); - return this->push_consumer_y_.get_data (); -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -typename CCM_TYPE::push_consumer_y_traits::data_control_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_y_data_control (void) -{ - this->push_consumer_y_.set_component (this); - return this->push_consumer_y_.get_data_control (); -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -typename CCM_TYPE::push_consumer_y_traits::dds_entity_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_y_dds_entity (void) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_y_dds_entity"); - this->push_consumer_y_.set_component (this); - return this->push_consumer_y_.get_dds_entity (); -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -typename CCM_TYPE::observable_y_traits::data_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_observable_y_data (void) -{ - this->observable_y_.set_component (this); - return this->observable_y_.get_data (); -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -typename CCM_TYPE::observable_y_traits::dds_entity_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_observable_y_dds_entity (void) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::get_observable_y_dds_entity"); - this->observable_y_.set_component (this); - return this->observable_y_.get_dds_entity (); -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::configuration_complete (void) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::configuration_complete"); - // Init default domain in Base_Connector - BaseConnector::configuration_complete (); - - if (::CORBA::is_nil (this->domain_participant_.in ())) - { - ACE_ERROR ((LM_ERROR, "FooConnector_Connector_T::configuration complete init_domain - " - "Error domain_participant\n")); - throw ::CORBA::INTERNAL (); - } - - // Second argument can be removed if register_type is changed in (Topic)Base_Connector_T - this->register_type (this->domain_participant_.in (), - "dummy_name"); - - const char* typesupport_name_t = DDS_TYPE_T::type_support::get_type_name (); - const char* typesupport_name_y = DDS_TYPE_Y::type_support::get_type_name (); - - // Create the topics needed - this->init_topic (this->domain_participant_.in (), - this->topic_t_.inout () , - this->topic_name_t_.in (), - typesupport_name_t); - - if (::CORBA::is_nil (this->topic_t_.in ())) - { - ACE_ERROR ((LM_ERROR, "FooConnector_Connector_T*** configuration complete init_topic - " - "Error creating topic for t\n")); - throw ::CORBA::INTERNAL (); - } - - this->init_topic (this->domain_participant_.in (), - this->topic_y_.inout () , - this->topic_name_y_.in (), - typesupport_name_y); - - if (::CORBA::is_nil (this->topic_y_.in ())) - { - ACE_ERROR ((LM_ERROR, "FooConnector_Connector_T*** configuration complete init_topic - " - "Error creating topic for y\n")); - throw ::CORBA::INTERNAL (); - } - - // Init the subscriber and publisher - this->init_subscriber (this->domain_participant_.in (), - this->subscriber_t_.inout ()); - this->init_publisher (this->domain_participant_.in (), - this->publisher_t_.inout ()); - this->init_subscriber (this->domain_participant_.in (), - this->subscriber_y_.inout ()); - this->init_publisher (this->domain_participant_.in (), - this->publisher_y_.inout ()); - - this->observable_t_.configuration_complete ( - this->topic_t_.in (), - this->publisher_t_.in (), - this->qos_profile_); - this->observable_y_.configuration_complete ( - this->topic_y_.in (), - this->publisher_y_.in (), - this->qos_profile_); - - this->dl_t_ = this->context_->get_connection_push_consumer_t_data_listener (); - this->dl_y_ = this->context_->get_connection_push_consumer_y_data_listener (); - - this->push_consumer_t_psl = - this->context_->get_connection_push_consumer_t_status (); - - this->push_consumer_y_psl = - this->context_->get_connection_push_consumer_y_status (); - - - this->push_consumer_t_.configuration_complete ( - this->topic_t_.in (), - this->subscriber_t_.in (), - this->qos_profile_); - this->push_consumer_y_.configuration_complete ( - this->topic_y_.in (), - this->subscriber_y_.in (), - this->qos_profile_); -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::ccm_activate (void) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::ccm_activate"); - BaseConnector::ccm_activate (); - ACE_Reactor* reactor = 0; - - this->activate_subscriber (reactor, - this->subscriber_t_.in (), - this->subscriber_t_listener_.inout ()); - this->activate_publisher (reactor, - this->publisher_t_.in (), - this->publisher_t_listener_.inout ()); - - this->activate_topic ( reactor, - this->topic_t_.in (), - this->topiclistener_t_.inout ()); - this->activate_topic (reactor, - this->topic_y_.in (), - this->topiclistener_y_.inout ()); - - this->push_consumer_t_.activate (this->dl_t_.in (), - push_consumer_t_psl.in (), - this->reactor_); - - this->push_consumer_y_.activate (this->dl_y_.in (), - push_consumer_y_psl.in (), - this->reactor_); - this->observable_t_.activate (); - this->observable_y_.activate (); -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::ccm_passivate (void) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::ccm_passivate"); - - if (ACE_OS::strlen (this->topic_name_t_) != 0) - { - this->observable_t_.passivate (); - this->push_consumer_t_.passivate (); - } - if (ACE_OS::strlen (this->topic_name_y_) != 0) - { - this->observable_y_.passivate (); - this->push_consumer_y_.passivate (); - } - - ::DDS::TopicListener_var topiclistener_t = - this->topiclistener_t_._retn (); - if (! CORBA::is_nil (topiclistener_t.in ())) - { - this->passivate_topic (this->topic_t_.in (), - topiclistener_t.in ()); - } - - ::DDS::TopicListener_var topiclistener_y = - this->topiclistener_y_._retn (); - if (! CORBA::is_nil (topiclistener_y.in ())) - { - this->passivate_topic (this->topic_y_.in (), - topiclistener_y.in ()); - } - - ::DDS::SubscriberListener_var subscriber_t_listener = - this->subscriber_t_listener_._retn (); - if (!::CORBA::is_nil (subscriber_t_listener.in ())) - { - this->passivate_subscriber (this->subscriber_t_.in (), - subscriber_t_listener.in ()); - } - - ::DDS::PublisherListener_var publisher_t_listener = - this->publisher_t_listener_._retn (); - if (!::CORBA::is_nil (publisher_t_listener.in ())) - { - this->passivate_publisher (this->publisher_t_.in (), - publisher_t_listener.in ()); - } - - ::DDS::SubscriberListener_var subscriber_y_listener = - this->subscriber_y_listener_._retn (); - if (!::CORBA::is_nil (subscriber_y_listener.in ())) - { - this->passivate_subscriber (this->subscriber_y_.in (), - subscriber_y_listener.in ()); - } - - ::DDS::PublisherListener_var publisher_y_listener = - this->publisher_y_listener_._retn (); - if (!::CORBA::is_nil (publisher_y_listener.in ())) - { - this->passivate_publisher (this->publisher_y_.in (), - publisher_y_listener.in ()); - } - - BaseConnector::ccm_passivate (); -} - -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> -void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::ccm_remove (void) -{ - DDS4CCM_TRACE ("FooConnector_Connector_T::ccm_remove"); - - if (ACE_OS::strlen (this->topic_name_t_) != 0) - { - this->observable_t_.remove (this->publisher_t_.in ()); - this->push_consumer_t_.remove (this->subscriber_t_.in ()); - - } - - if (ACE_OS::strlen (this->topic_name_y_) != 0) - { - this->observable_y_.remove (this->publisher_y_.in ()); - this->push_consumer_y_.remove (this->subscriber_y_.in ()); - } - - ::DDS::Topic_var topic_t = this->topic_t_._retn (); - if (! CORBA::is_nil (topic_t.in ())) - { - this->remove_topic (this->domain_participant_.in (), - topic_t.in ()); - } - - ::DDS::Topic_var topic_y = this->topic_y_._retn (); - if (! CORBA::is_nil (topic_y.in ())) - { - this->remove_topic (this->domain_participant_.in (), - topic_y.in ()); - } - - const char* typesupport_name_t = DDS_TYPE_T::type_support::get_type_name (); - this->unregister_type (this->domain_participant_.in (), - typesupport_name_t); - const char* typesupport_name_y = DDS_TYPE_Y::type_support::get_type_name (); - this->unregister_type (this->domain_participant_.in (), - typesupport_name_y); - - ::DDS::Publisher_var publisher_t = this->publisher_t_._retn (); - if (!::CORBA::is_nil (publisher_t.in ())) - { - this->remove_publisher (this->domain_participant_.in (), - publisher_t.in ()); - } - - ::DDS::Subscriber_var subscriber_t = this->subscriber_t_._retn (); - if (!::CORBA::is_nil (subscriber_t.in ())) - { - this->remove_subscriber (this->domain_participant_.in (), - subscriber_t.in ()); - } - - ::DDS::Publisher_var publisher_y = this->publisher_y_._retn (); - if (!::CORBA::is_nil (publisher_y.in ())) - { - this->remove_publisher (this->domain_participant_.in (), - publisher_y.in ()); - } - ::DDS::Subscriber_var subscriber_y = this->subscriber_y_._retn (); - if (!::CORBA::is_nil (subscriber_y.in ())) - { - this->remove_subscriber (this->domain_participant_.in (), - subscriber_y.in ()); - } - - BaseConnector::ccm_remove (); - } diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h deleted file mode 100644 index 140f5aab79d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h +++ /dev/null @@ -1,193 +0,0 @@ -#ifndef DDS_MLT_CONNECTOR_T_H_ -#define DDS_MLT_CONNECTOR_T_H_ - -#include "connectors/dds4ccm/impl/DDS_Base_Connector_T.h" -#include "connectors/dds4ccm/impl/DDS_Write_T.h" -#include "connectors/dds4ccm/impl/DDS_Get_T.h" -#include "connectors/dds4ccm/impl/DDS_Listen_T.h" -#include "connectors/dds4ccm/impl/DDS_Update_T.h" -#include "connectors/dds4ccm/impl/DataListenerControl_T.h" - -template <typename CCM_TYPE, - typename DDS_TYPE_T, bool FIXED_T, - typename SEQ_TYPE_T, - typename DDS_TYPE_Y, bool FIXED_Y, - typename SEQ_TYPE_Y> -class FooConnector_Connector_T - : public virtual DDS_Base_Connector_T<CCM_TYPE> -{ - - typedef DDS_Base_Connector_T<CCM_TYPE> BaseConnector; - -public: - FooConnector_Connector_T (void); - - virtual - void - register_type ( - ::DDS::DomainParticipant_ptr participant, - const char * typesupport_name); - - virtual - void - unregister_type ( - ::DDS::DomainParticipant_ptr participant, - const char * typesupport_name); - - /** - * T type connector - **/ - // DDS_Listen operations - virtual - CCM_DDS::CCM_ContentFilterSetting* - get_push_consumer_t_filter_config(void); - - virtual - CCM_DDS::QueryFilter * - push_consumer_t_filter (void); - - virtual - void - push_consumer_t_filter (const ::CCM_DDS::QueryFilter &); - - virtual - typename CCM_TYPE::push_consumer_t_traits::data_type::_ptr_type - get_push_consumer_t_data (void); - - virtual - typename CCM_TYPE::push_consumer_t_traits::data_control_type::_ptr_type - get_push_consumer_t_data_control (void); - - virtual - typename CCM_TYPE::push_consumer_t_traits::dds_entity_type::_ptr_type - get_push_consumer_t_dds_entity (void); - - // DDS_Update operations - virtual - typename CCM_TYPE::observable_t_traits::data_type::_ptr_type - get_observable_t_data (void); - - virtual - typename CCM_TYPE::observable_t_traits::dds_entity_type::_ptr_type - get_observable_t_dds_entity (void); - - - - /** - * Y type connector - **/ - // DDS_Listen operations - virtual - CCM_DDS::CCM_ContentFilterSetting* - get_push_consumer_y_filter_config(void); - - virtual - CCM_DDS::QueryFilter * - push_consumer_y_filter (void); - - virtual - void - push_consumer_y_filter (const ::CCM_DDS::QueryFilter &); - - virtual - typename CCM_TYPE::push_consumer_y_traits::data_type::_ptr_type - get_push_consumer_y_data (void); - - virtual - typename CCM_TYPE::push_consumer_y_traits::data_control_type::_ptr_type - get_push_consumer_y_data_control (void); - - virtual - typename CCM_TYPE::push_consumer_y_traits::dds_entity_type::_ptr_type - get_push_consumer_y_dds_entity (void); - - // DDS_Update operations - virtual - typename CCM_TYPE::observable_y_traits::data_type::_ptr_type - get_observable_y_data (void); - - virtual - typename CCM_TYPE::observable_y_traits::dds_entity_type::_ptr_type - get_observable_y_dds_entity (void); - - - - /** - * Topic names. - **/ - virtual char * topic_name_t (void); - virtual void topic_name_t (const char * topic_name_t); - virtual char * topic_name_y (void); - virtual void topic_name_y (const char * topic_name_y); - - /** - * Deployment methods. - **/ - virtual void configuration_complete (void); - virtual void ccm_remove (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - -private: - DDS_Listen_T< - typename CCM_TYPE::push_consumer_t_traits, - typename DDS_TYPE_T::typed_reader_type, - typename DDS_TYPE_T::value_type, - SEQ_TYPE_T> - push_consumer_t_; - DDS_Listen_T< - typename CCM_TYPE::push_consumer_y_traits, - typename DDS_TYPE_Y::typed_reader_type, - typename DDS_TYPE_Y::value_type, - SEQ_TYPE_Y> - push_consumer_y_; - - DDS_Update_T< - typename CCM_TYPE::observable_t_traits, - typename DDS_TYPE_T::typed_writer_type, - typename DDS_TYPE_T::value_type, - SEQ_TYPE_T> - observable_t_; - - DDS_Update_T< - typename CCM_TYPE::observable_y_traits, - typename DDS_TYPE_Y::typed_writer_type, - typename DDS_TYPE_Y::value_type, - SEQ_TYPE_Y> - observable_y_; - - //connection to the receiver implementation - typename CCM_TYPE::push_consumer_t_traits::data_listener_type::_var_type dl_t_; - typename CCM_TYPE::push_consumer_y_traits::data_listener_type::_var_type dl_y_; - - ::CCM_DDS::PortStatusListener_var push_consumer_t_psl; - ::CCM_DDS::PortStatusListener_var push_consumer_y_psl; - - ::DDS::Publisher_var publisher_t_; - ::DDS::PublisherListener_var publisher_t_listener_; - ::DDS::Subscriber_var subscriber_t_; - ::DDS::SubscriberListener_var subscriber_t_listener_; - - ::DDS::Publisher_var publisher_y_; - ::DDS::PublisherListener_var publisher_y_listener_; - ::DDS::Subscriber_var subscriber_y_; - ::DDS::SubscriberListener_var subscriber_y_listener_; - - CORBA::String_var topic_name_t_; - CORBA::String_var topic_name_y_; - - ::DDS::Topic_var topic_t_; - ::DDS::Topic_var topic_y_; - - ::DDS::TopicListener_var topiclistener_t_; - ::DDS::TopicListener_var topiclistener_y_; - - ACE_Reactor * reactor_; - - void create_topics (const char * typesupport_name); - -}; - -#include "MultipleTemp_Connector_T.cpp" - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/ccm_dds_mlt.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/ccm_dds_mlt.idl deleted file mode 100644 index 9a3df82c7f0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/ccm_dds_mlt.idl +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef CCM_DDS_MLT_IDL -#define CCM_DDS_MLT_IDL - -#include <Components.idl> - -#pragma dds4ccm impl "MultipleTemp_Connector_T.h" - -#include <ccm_dds.idl> - -module CCM_DDS -{ - module Duplex_Typed <typename T, sequence<T> TSeq, typename Y, sequence <Y> YSeq> { - alias Typed <T, TSeq> T_Typed; - alias Typed <Y, YSeq> Y_Typed; - - connector FooConnector : CCM_DDS::DDS_Base - { - mirrorport T_Typed::DDS_Listen push_consumer_t; - mirrorport Y_Typed::DDS_Listen push_consumer_y; - mirrorport T_Typed::DDS_Update observable_t; - mirrorport Y_Typed::DDS_Update observable_y; - - attribute string topic_name_t; - attribute string topic_name_y; - - }; - }; -}; - -#endif // CCM_DDS_MLT_IDL diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl deleted file mode 100644 index 6b259d3b560..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/MultipleTemp_Connector.idl" - -module MultipleTemp -{ - component Receiver - { - port MultipleTempConnector::T_Typed::DDS_Listen info_one_out; - port MultipleTempConnector::Y_Typed::DDS_Listen info_two_out; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc deleted file mode 100644 index e7d436114cc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc +++ /dev/null @@ -1,141 +0,0 @@ -project(DDS_MultipleTemp_Receiver_idl_gen) : componentidldefaults, dds4ccm { - requires += dummy_label - custom_only = 1 - after += DDS_MT_TEMP_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h -I.. - - IDL_Files { - MultipleTemp_Receiver.idl - } -} - -project(DDS_MultipleTemp_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - requires += dummy_label - after += DDS_MultipleTemp_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - MultipleTemp_ReceiverE.idl - } -} - -project(DDS_MT_TEMP_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - requires += dummy_label - after += DDS_MultipleTemp_Receiver_lem_gen DDS_MultipleTemp_Receiver_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub - libs += Receiver_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultipleTemp_ReceiverEC.cpp - } - - Header_Files { - MultipleTemp_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - MultipleTemp_ReceiverEC.inl - } -} - -project(DDS_MultipleTemp_Receiver_stub) : ccm_stub, dds4ccm_base { - requires += dummy_label - after += DDS_MultipleTemp_Receiver_idl_gen DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub DDS_MT_TEMP_Connector_lem_gen - libs += DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags += RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultipleTemp_ReceiverC.cpp - } - - Header_Files { - MultipleTemp_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - MultipleTemp_ReceiverC.inl - } -} - -project(DDS_MultipleTemp_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - requires += dummy_label - after += DDS_MT_TEMP_Receiver_lem_stub DDS_MultipleTemp_Receiver_stub DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub DDS_MT_TEMP_Connector_lem_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub DDS_MT_TEMP_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultipleTemp_Receiver_exec.cpp - } - - Header_Files { - MultipleTemp_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_MultipleTemp_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - requires += dummy_label - after += DDS_MT_TEMP_Receiver_lem_stub DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Connector_svnt DDS_MultipleTemp_Receiver_exec DDS_MT_TEMP_Connector_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Connector_svnt Receiver_exec DDS_MT_TEMP_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultipleTemp_ReceiverS.cpp - MultipleTemp_Receiver_svnt.cpp - } - - Header_Files { - MultipleTemp_ReceiverS.h - MultipleTemp_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp deleted file mode 100644 index 0f6ccb4596c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp +++ /dev/null @@ -1,250 +0,0 @@ -// -*- C++ -*- -// Test for MULTIPLE_TEMPLATES - -#include "MultipleTemp_Receiver_exec.h" -#include "ace/Log_Msg.h" - -#include "ace/OS_NS_time.h" -#include "dds4ccm/impl/Utils.h" -#include "dds4ccm/impl/TimeUtilities.h" - -#include "dds4ccm/impl/dds4ccm_conf.h" - -namespace CIAO_MultipleTemp_Receiver_Impl -{ - CORBA::UShort received_one= 0; - CORBA::UShort received_two= 0; - - //============================================================ - // ListenOne_Listener_exec_i Listener to topic One - //============================================================ - ListenOne_Listener_exec_i::ListenOne_Listener_exec_i ( - ::MultipleTemp::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::MultipleTemp::CCM_Receiver_Context::_duplicate (ctx)) - - { - } - - ListenOne_Listener_exec_i::~ListenOne_Listener_exec_i (void) - { - } - - void - ListenOne_Listener_exec_i::on_one_data ( - const TestTopicOne & an_instance, - const ::CCM_DDS::ReadInfo & info) - { - ACE_DEBUG ((LM_DEBUG, "ListenOne_Listener_exec_i::on_one_data: " - "key <%C> - x <%d>\n", - an_instance.keyOne.in (), - an_instance.x)); - if ( info.instance_handle == ::DDS::HANDLE_NIL) - { - ACE_ERROR ((LM_ERROR, "ERROR: ListenOne_Listener_exec_i::on_one_data: " - "instance handle seems to be invalid " - "key <%C> - x <%d>\n", - an_instance.keyOne.in (), - an_instance.x)); - } - if (info.source_timestamp.sec == 0 && - info.source_timestamp.nanosec == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: ListenOne_Listener_exec_i::on_one_data: " - "source timestamp seems to be invalid (nil) " - "key <%C> - x <%d>\n", - an_instance.keyOne.in (), - an_instance.x)); - } - ++received_one; - } - - void - ListenOne_Listener_exec_i::on_many_data ( - const TestTopicOneSeq & , - const ::CCM_DDS::ReadInfoSeq & ) - { - } - //============================================================ - // ListenTwo_Listener_exec_i Listener to topic Two - //============================================================ - ListenTwo_Listener_exec_i::ListenTwo_Listener_exec_i ( - ::MultipleTemp::CCM_Receiver_Context_ptr ctx) - : ciao_context_ ( - ::MultipleTemp::CCM_Receiver_Context::_duplicate (ctx)) - { - } - - ListenTwo_Listener_exec_i::~ListenTwo_Listener_exec_i (void) - { - } - - void - ListenTwo_Listener_exec_i::on_one_data ( - const TestTopicTwo & an_instance, - const ::CCM_DDS::ReadInfo & info) - { - ACE_DEBUG ((LM_DEBUG, "ListenTwo_Listener_exec_i::on_one_data: " - "key <%C> - y <%d>\n", - an_instance.keyTwo.in (), - an_instance.y)); - if (::DDS::HANDLE_NIL == info.instance_handle) - { - ACE_ERROR ((LM_ERROR, "ERROR: ListenTwo_Listener_exec_i::on_one_data: " - "instance handle seems to be invalid " - "key <%C> - y <%d>\n", - an_instance.keyTwo.in (), - an_instance.y)); - } - if (info.source_timestamp.sec == 0 && - info.source_timestamp.nanosec == 0) - { - ACE_ERROR ((LM_ERROR, "ERROR: ListenTwo_Listener_exec_i::on_one_data: " - "source timestamp seems to be invalid (nil) " - "key <%C> - iteration <%d>\n", - an_instance.keyTwo.in (), - an_instance.y)); - } - ++received_two; - } - - void - ListenTwo_Listener_exec_i::on_many_data ( - const TestTopicTwoSeq & , - const ::CCM_DDS::ReadInfoSeq & ) - { - } - - //============================================================ - // Receiver_exec_i - //============================================================ - Receiver_exec_i::Receiver_exec_i (void) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - // Port operations. - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_one_out_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_two_out_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener_ptr - Receiver_exec_i::get_info_one_out_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_one_data_listener_.in ())) - { - ListenOne_Listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - ListenOne_Listener_exec_i ( - this->ciao_context_.in ()), - ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener::_nil ()); - this->ciao_info_out_one_data_listener_ = tmp; - } - - return - ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener::_duplicate ( - this->ciao_info_out_one_data_listener_.in ()); - } - - ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener_ptr - Receiver_exec_i::get_info_two_out_data_listener (void) - { - if ( ::CORBA::is_nil (this->ciao_info_out_two_data_listener_.in ())) - { - ListenTwo_Listener_exec_i *tmp = 0; - ACE_NEW_RETURN ( - tmp, - ListenTwo_Listener_exec_i ( - this->ciao_context_.in ()), - ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener::_nil ()); - this->ciao_info_out_two_data_listener_ = tmp; - } - - return - ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener::_duplicate ( - this->ciao_info_out_two_data_listener_.in ()); - } - - // Operations from Components::SessionComponent. - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->ciao_context_ = - ::MultipleTemp::CCM_Receiver_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->ciao_context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - } - - void - Receiver_exec_i::ccm_activate (void) - { - ::CCM_DDS::DataListenerControl_var dlc_one = - this->ciao_context_->get_connection_info_one_out_data_control (); - ::CCM_DDS::DataListenerControl_var dlc_two = - this->ciao_context_->get_connection_info_two_out_data_control (); - dlc_one->mode (::CCM_DDS::ONE_BY_ONE); - dlc_two->mode (::CCM_DDS::ONE_BY_ONE); - } - - void - Receiver_exec_i::ccm_passivate (void) - { - - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (received_one != 8) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver: " - "Received wrong number of topic one: " - "received <%C> - expected <8>\n", - received_one)); - } - if (received_two != 8) - { - ACE_ERROR ((LM_ERROR, "ERROR: Receiver: " - "Received wrong number of topic two: " - "received <%C> - expected <8>\n", - received_two)); - } - if ((received_two == 8) && (received_one == 8)) - { - ACE_DEBUG ((LM_DEBUG, "OK: Receiver: " - "Received received expected topics.\n")); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_MultipleTemp_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h deleted file mode 100644 index f49ef8e3df1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h +++ /dev/null @@ -1,111 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_RECEIVER_EXEC_H_ -#define CIAO_RECEIVER_EXEC_H_ - -#include "MultipleTemp_ReceiverEC.h" - -#include /**/ "Receiver_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - - -namespace CIAO_MultipleTemp_Receiver_Impl -{ - class Receiver_exec_i; - - //============================================================ - // ListenOneByOneTest_Listener_exec_i one - //============================================================ - class RECEIVER_EXEC_Export ListenOne_Listener_exec_i - : public virtual ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - ListenOne_Listener_exec_i ( - ::MultipleTemp::CCM_Receiver_Context_ptr ctx); - - virtual ~ListenOne_Listener_exec_i (void); - - virtual void - on_one_data ( - const TestTopicOne& an_instance, - const ::CCM_DDS::ReadInfo & info); - virtual void - on_many_data ( - const TestTopicOneSeq & an_instance, - const ::CCM_DDS::ReadInfoSeq & info); - private: - ::MultipleTemp::CCM_Receiver_Context_var ciao_context_; - }; - //============================================================ - // ListenOneByOneTest_Listener_exec_i two - //============================================================ - class RECEIVER_EXEC_Export ListenTwo_Listener_exec_i - : public virtual ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener, - public virtual ::CORBA::LocalObject - { - public: - ListenTwo_Listener_exec_i ( - ::MultipleTemp::CCM_Receiver_Context_ptr ctx); - - virtual ~ListenTwo_Listener_exec_i (void); - - virtual void - on_one_data ( - const TestTopicTwo& an_instance, - const ::CCM_DDS::ReadInfo & info); - virtual void - on_many_data ( - const TestTopicTwoSeq & an_instance, - const ::CCM_DDS::ReadInfoSeq & info); - private: - ::MultipleTemp::CCM_Receiver_Context_var ciao_context_; - }; - //============================================================ - // Receiver_exec_i - //============================================================ - class RECEIVER_EXEC_Export Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - // Port operations. - virtual ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener_ptr - get_info_one_out_data_listener (void); - virtual ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener_ptr - get_info_two_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_one_out_status (void); - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_two_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: - ::MultipleTemp::CCM_Receiver_Context_var ciao_context_; - ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener_var ciao_info_out_one_data_listener_; - ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener_var ciao_info_out_two_data_listener_; - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_MultipleTemp_Receiver_Impl (void); -} - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl deleted file mode 100644 index 8d9bc7ac108..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file - * @author Marijke Hengstmengel (mhengstmengel@remedy.nl) - */ - -#ifndef DDS_MULTIPLE_TEMP_SENDER_IDL -#define DDS_MULTIPLE_TEMP_SENDER_IDL - -#include "Connector/MultipleTemp_Connector.idl" - -module MultipleTemp -{ - component Sender - { - port MultipleTempConnector::T_Typed::DDS_Update test_topic_one_update; - port MultipleTempConnector::Y_Typed::DDS_Update test_topic_two_update; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc deleted file mode 100644 index 2fad9a0818e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc +++ /dev/null @@ -1,142 +0,0 @@ -project(DDS_MultipleTemp_Sender_idl_gen) : componentidldefaults, dds4ccm { - requires += dummy_label - after += DDS_MT_TEMP_Connector_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - MultipleTemp_Sender.idl - } -} - -project(DDS_MultipleTemp_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - requires += dummy_label - after += DDS_MultipleTemp_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - MultipleTemp_SenderE.idl - } -} - -project(DDS_MultipleTemp_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - requires += dummy_label - after += DDS_MultipleTemp_Sender_lem_gen DDS_MultipleTemp_Sender_stub DDS_MultipleTemp_Base_stub - libs += DDS_MultipleTemp_Base_stub Sender_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags += SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultipleTemp_SenderEC.cpp - } - - Header_Files { - MultipleTemp_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - MultipleTemp_SenderEC.inl - } -} - -project(DDS_MultipleTemp_Sender_stub) : ccm_stub, dds4ccm_base { - requires += dummy_label - after += DDS_MultipleTemp_Sender_idl_gen DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub - libs += DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags += SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultipleTemp_SenderC.cpp - } - - Header_Files { - MultipleTemp_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - MultipleTemp_SenderC.inl - } -} - -project(DDS_MultipleTemp_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - requires += dummy_label - after += DDS_MultipleTemp_Sender_lem_stub DDS_MultipleTemp_Sender_stub DDS_MT_TEMP_Connector_lem_stub DDS_MultipleTemp_Connector_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_MultipleTemp_Base_stub DDS_MT_TEMP_Connector_lem_stub DDS_MultipleTemp_Connector_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags += SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultipleTemp_Sender_exec.cpp - } - - Header_Files { - MultipleTemp_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(DDS_MultipleTemp_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - requires += dummy_label - after += DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Sender_lem_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Connector_svnt DDS_MT_TEMP_Connector_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub \ - DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Connector_svnt DDS_MT_TEMP_Connector_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags += SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - MultipleTemp_SenderS.cpp - MultipleTemp_Sender_svnt.cpp - } - - Header_Files { - MultipleTemp_SenderS.h - MultipleTemp_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp deleted file mode 100644 index 5df1ea1c79c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp +++ /dev/null @@ -1,373 +0,0 @@ -// -*- C++ -*- -//Test Multiple templates connector -#include "MultipleTemp_Sender_exec.h" -#include "ace/Guard_T.h" -#include "ace/Log_Msg.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" - -namespace CIAO_MultipleTemp_Sender_Impl -{ - - //============================================================ - // Pulse generator - //============================================================ - pulse_Generator::pulse_Generator (Sender_exec_i &callback) - : pulse_callback_ (callback) - { - } - - int - pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - // Notify the subscribers - this->pulse_callback_.tick (); - return 0; - } - - //============================================================ - // Component Executor Implementation Class: Sender_exec_i - //============================================================ - Sender_exec_i::Sender_exec_i (void) - : test_nr_(UPDATE_CREATE), - test_ok_(true) - { - this->ticker_ = new pulse_Generator (*this); - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - ACE_Reactor* - Sender_exec_i::reactor (void) - { - ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = - this->context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) - { - ::CORBA::ORB_var orb = ccm_object->_get_orb (); - if (! ::CORBA::is_nil (orb.in ())) - { - reactor = orb->orb_core ()->reactor (); - } - } - if (reactor == 0) - { - throw ::CORBA::INTERNAL (); - } - return reactor; - } - // Supported operations and attributes. - CORBA::Boolean - Sender_exec_i::create_one_topic() - { - CORBA::Boolean result = true; - TestTopicOne i = this->topic_one_seq_one_[0]; - TestTopicTwo u = this->topic_two_seq_one_[0]; - try - { - if ( ::CORBA::is_nil (this->updater_one_) || - ::CORBA::is_nil (this->updater_two_)) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: updater_ is nil"))); - result= false; - } - else - { - this->updater_one_->create_one(i); - this->updater_two_->create_one(u); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("MultipleTemp: create_one for both topics ") - ACE_TEXT ("<%C> and <%C>\n"), - i.keyOne.in(), u.keyTwo.in())); - } - } - catch(const CCM_DDS::AlreadyCreated &) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unexpected exception: ") - ACE_TEXT ("AlreadyCreated with test updater") - ACE_TEXT (" create_one <%C> or <%C>.\n"), - i.keyOne.in(), u.keyTwo.in())); - result= false; - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while create_one.\n"))); - result = false;; - } - return result; - } - - - CORBA::Boolean - Sender_exec_i::update_one_topic() - { - //update already created instance with handle nil - CORBA::Boolean result = true; - TestTopicOne i = this->topic_one_seq_one_[0]; - TestTopicTwo u = this->topic_two_seq_one_[0]; - - try - { - this->updater_one_->update_one(i, DDS::HANDLE_NIL); - this->updater_two_->update_one(u, DDS::HANDLE_NIL); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("MultipleTemp: update_one with already") - ACE_TEXT (" existing instance with DDS::HANDLE_NIL,") - ACE_TEXT (" key <%C> and key <%C>\n"), - i.keyOne.in(), u.keyTwo.in())); - } - catch(const CCM_DDS::NonExistent &) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unexpected exception: ") - ACE_TEXT ("NonExistent with test updater ") - ACE_TEXT ("update_one.\n"))); - result = false; - } - catch (const CCM_DDS::InternalError& ) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while update_one.\n"))); - result = false; - } - return result; - } - - CORBA::Boolean - Sender_exec_i::create_many_topics() - { - //create many with no exception - CORBA::Boolean result = false; - try - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("create_many both topics : <%u> samples\n"), - this->topic_one_seq_many_.length ())); - this->updater_one_->create_many (this->topic_one_seq_many_); - this->updater_two_->create_many (this->topic_two_seq_many_); - - result = true; - } - catch(const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR Unexpected exception:") - ACE_TEXT (" NonExistent with test updater create_many\n"))); - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error in updater:") - ACE_TEXT (" create_many: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - - } - return result; - } - - CORBA::Boolean - Sender_exec_i::update_many_topics() - { - CORBA::Boolean result = false; - try - { - this->updater_one_->update_many (this->topic_one_seq_many_); - this->updater_two_->update_many (this->topic_two_seq_many_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("update_many : written <%u> samples\n"), - this->topic_one_seq_many_.length ())); - result = true; - } - catch(const CCM_DDS::NonExistent& ) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unexpected exception: NonExistent ") - ACE_TEXT ("with test updater update_many.\n"))); - result = false; - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("with update_many: index <%d> - retval <%d>\n"), - ex.index, ex.error_code)); - result = false; - } - return result; - } - - void - Sender_exec_i::add_instances_of_topic () - { - //make 4 sequences of instances as testdata - CORBA::UShort total = 3; - this->topic_one_seq_one_.length (total); - //sequence for tests with .._one - for (int i = 1; i < (total + 1); i++) - { - char key[9]; - TestTopicOne new_key; - ACE_OS::sprintf (key, "keyONE_%d", i); - new_key.keyOne = CORBA::string_dup(key); - new_key.x = i; - this->topic_one_seq_one_[i-1] = new_key; - } - //sequence for tests with .._many - this->topic_one_seq_many_.length (total); - for (int i = 1; i < (total + 1); i++) - { - char key[10]; - TestTopicOne new_key; - ACE_OS::sprintf (key, "manyOne_%d", i); - new_key.keyOne = CORBA::string_dup(key); - new_key.x = i; - this->topic_one_seq_many_[i-1] = new_key; - } - this->topic_two_seq_one_.length (total); - //sequence for tests with .._one - for (int i = 1; i < (total + 1); i++) - { - char key[9]; - TestTopicTwo new_key; - ACE_OS::sprintf (key, "keyTWO_%d", i); - new_key.keyTwo = CORBA::string_dup(key); - new_key.y = i; - new_key.z = i; - this->topic_two_seq_one_[i-1] = new_key; - } - //sequence for tests with .._many - this->topic_two_seq_many_.length (total); - for (int i = 1; i < (total + 1); i++) - { - char key[10]; - TestTopicTwo new_key; - ACE_OS::sprintf (key, "manyTwo_%d", i); - new_key.keyTwo = CORBA::string_dup(key); - new_key.y = i; - new_key.z = i; - this->topic_two_seq_many_[i-1] = new_key; - } - } - - void - Sender_exec_i::tick () - { - if(this->test_ok_.value()) - { - switch (this->test_nr_) - { - case UPDATE_CREATE: - this->test_ok_ = this->create_one_topic(); - if(this->test_ok_.value()) - { - this->test_nr_ = UPDATE_ONE; - } - else - { - this->test_nr_ = END_TEST; - } - break; - case UPDATE_ONE: - this->test_ok_ = this->update_one_topic(); - this->test_nr_ = CREATE_MANY; - break; - case CREATE_MANY: - this->test_ok_ = this->create_many_topics(); - if(this->test_ok_.value()) - { - this->test_nr_ = UPDATE_MANY; - } - else - { - this->test_nr_ = END_TEST; - } - this->test_nr_ = UPDATE_MANY; - break; - case UPDATE_MANY: - this->test_ok_ = this->update_many_topics(); - this->test_nr_ = END_TEST; - break; - default: - break; - } - } - } - void - Sender_exec_i::start (void) - { - long sec = 3L; - long const usec = 0L; - if (this->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value (sec, usec), - ACE_Time_Value (sec, usec)) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") - ACE_TEXT ("Error scheduling timer"))); - } - } - - void - Sender_exec_i::stop (void) - { - this->reactor ()->cancel_timer (this->ticker_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n"))); - delete this->ticker_; - } - - void - Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = ::MultipleTemp::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - this->updater_one_ = - this->context_->get_connection_test_topic_one_update_data (); - this->updater_two_ = - this->context_->get_connection_test_topic_two_update_data (); - } - - void - Sender_exec_i::ccm_activate (void) - { - this->add_instances_of_topic (); - this->start (); - } - - void - Sender_exec_i::ccm_passivate (void) - { - this->stop (); - } - - void - Sender_exec_i::ccm_remove (void) - { - if(!this->test_ok_.value()) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Error in MultipleTemp in Sender"))); - } - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_MultipleTemp_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h deleted file mode 100644 index 7158bbe145e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h +++ /dev/null @@ -1,83 +0,0 @@ -// -*- C++ -*- -#ifndef CIAO_SENDER_EXEC_H_ -#define CIAO_SENDER_EXEC_H_ - -#include "MultipleTemp_SenderEC.h" - -#include /**/ "Sender_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_MultipleTemp_Sender_Impl -{ - typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean; - - class Sender_exec_i; - - enum MULTIPLE_TEMP_TEST { - UPDATE_CREATE, - UPDATE_ONE, - CREATE_MANY, - UPDATE_MANY, - END_TEST - }; - - class pulse_Generator : - public ACE_Event_Handler - { - public: - pulse_Generator (Sender_exec_i &callback); - /// Handle the timeout. - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - /// Maintains a handle that actually process the event - Sender_exec_i &pulse_callback_; - }; - - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (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 (void); - - private: - ACE_Reactor* reactor (void); - void start (void); - void stop (void); - void add_instances_of_topic (void); - CORBA::Boolean create_one_topic(void); - CORBA::Boolean update_one_topic(void); - CORBA::Boolean create_many_topics(void); - CORBA::Boolean update_many_topics(void); - - pulse_Generator * ticker_; - ::MultipleTemp::CCM_Sender_Context_var context_; - ::MultipleTemp::MultipleTempConnector::T_Typed::Updater_var updater_one_; - ::MultipleTemp::MultipleTempConnector::Y_Typed::Updater_var updater_two_; - - MULTIPLE_TEMP_TEST test_nr_; - Atomic_Boolean test_ok_; - TestTopicOneSeq topic_one_seq_one_; - TestTopicOneSeq topic_one_seq_many_; - TestTopicTwoSeq topic_two_seq_one_; - TestTopicTwoSeq topic_two_seq_many_; - - }; - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_MultipleTemp_Sender_Impl (void); -} - -#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/Plan.cdp deleted file mode 100644 index 49bff6b4ba0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/Plan.cdp +++ /dev/null @@ -1,489 +0,0 @@ -<!-- --> -<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"> - <label>MultipleTemp_Depl_1</label> - <UUID>MultipleTemp_Depl_1</UUID> - - <implementation xmi:id="ReceiverComponentImplementation"> - <name>ReceiverComponentImplementation</name> - <source/> - <artifact xmi:idref="Receiver_ExecArtifact" /> - <artifact xmi:idref="Receiver_SvntArtifact" /> - <execParameter> - <!-- entrypoint as exec parameter (see 10.6.1) --> - <name>component factory</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_MultipleTemp_Receiver_Impl</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_MultipleTemp_Receiver_Servant</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Receiver_svnt</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Receiver_exec</string> - </value> - </value> - </execParameter> - </implementation> - - <implementation xmi:id="MultipleTemp_ConnectorComponentImplementation"> - <name>MultipleTemp_ConnectorComponentImplementation</name> - <source/> - <artifact xmi:idref="MultipleTemp_Connector_ExecArtifact" /> - <artifact xmi:idref="MultipleTemp_Connector_SvntArtifact" /> - <execParameter> - <!-- entrypoint as exec parameter (see 10.6.1) --> - <name>component factory</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_MultipleTemp_MultipleTempConnector_FooConnector_Impl</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_MultipleTemp_MultipleTempConnector_FooConnector_Servant</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>DDS_MultipleTemp_Connector_svnt</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>DDS_MultipleTemp_Connector_exec</string> - </value> - </value> - </execParameter> - </implementation> - - - <implementation xmi:id="SenderComponentImplementation"> - <name>SenderComponentImplementation</name> - <source/> - <artifact xmi:idref="Sender_ExecArtifact" /> - <artifact xmi:idref="Sender_SvntArtifact" /> - <execParameter> - <!-- entrypoint as exec parameter (see 10.6.1) --> - <name>component factory</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_MultipleTemp_Sender_Impl</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_MultipleTemp_Sender_Servant</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Sender_svnt</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Sender_exec</string> - </value> - </value> - </execParameter> - </implementation> - <instance xmi:id="ReceiverComponentInstance"> - <name>ReceiverComponent</name> - <node>ReceiverNode</node> - <!-- hostname --> - <source/> - <implementation xmi:idref="ReceiverComponentImplementation" /> - </instance> - - <instance xmi:id="MultipleTemp_ConnectorComponentInstance"> - <name>MultipleTemp_ConnectorComponent</name> - <node>SenderNode</node> - <!-- hostname --> - <source/> - <implementation xmi:idref="MultipleTemp_ConnectorComponentImplementation" /> - <configProperty> - <name>topic_name_t</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>TestOne</string> - </value> - </value> - </configProperty> - <configProperty> - <name>topic_name_y</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>TestTwo</string> - </value> - </value> - </configProperty> - </instance> - <instance xmi:id="MultipleTemp_ConnectorComponentInstance2"> - <name>MultipleTemp_ConnectorComponent2</name> - <node>ReceiverNode</node> - <!-- hostname --> - <source/> - <implementation xmi:idref="MultipleTemp_ConnectorComponentImplementation" /> - <configProperty> - <name>topic_name_t</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>TestOne</string> - </value> - </value> - </configProperty> - <configProperty> - <name>topic_name_y</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>TestTwo</string> - </value> - </value> - </configProperty> - </instance> - <instance xmi:id="SenderComponentInstance"> - <name>SenderComponent</name> - <node>SenderNode</node> - <!-- hostname --> - <source/> - <implementation xmi:idref="SenderComponentImplementation" /> - </instance> - - <connection> - <name>_listenercontrol_one</name> - <deployRequirement> - <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> - <resourceType>Local_Interface</resourceType> - </deployRequirement> - <internalEndpoint> - <portName>info_one_out_data_control</portName> - <provider>false</provider> - <kind>SimplexReceptacle</kind> - <instance xmi:idref="ReceiverComponentInstance" /> - </internalEndpoint> - <internalEndpoint> - <portName>push_consumer_t_data_control</portName> - <provider>true</provider> - <kind>Facet</kind> - <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" /> - </internalEndpoint> - </connection> - <connection> - <name>_statelistener_one</name> - <deployRequirement> - <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> - <resourceType>Local_Interface</resourceType> - </deployRequirement> - <internalEndpoint> - <portName>info_one_out_data_listener</portName> - <provider>true</provider> - <kind>Facet</kind> - <instance xmi:idref="ReceiverComponentInstance" /> - </internalEndpoint> - <internalEndpoint> - <portName>push_consumer_t_data_listener</portName> - <provider>false</provider> - <kind>SimplexReceptacle</kind> - <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" /> - </internalEndpoint> - </connection> - <!--connection> - <name>_portstatuslistener_one</name> - <deployRequirement> - <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> - <resourceType>Local_Interface</resourceType> - </deployRequirement> - <internalEndpoint> - <portName>info_one_out_status</portName> - <provider>true</provider> - <kind>Facet</kind> - <instance xmi:idref="ReceiverComponentInstance" /> - </internalEndpoint> - <internalEndpoint> - <portName>push_consumer_t_status</portName> - <provider>false</provider> - <kind>SimplexReceptacle</kind> - <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" /> - </internalEndpoint> - </connection--> - <connection> - <name>info_one_out_data</name> - <deployRequirement> - <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> - <resourceType>Local_Interface</resourceType> - </deployRequirement> - <internalEndpoint> - <portName>info_one_out_data</portName> - <provider>false</provider> - <kind>SimplexReceptacle</kind> - <instance xmi:idref="ReceiverComponentInstance" /> - </internalEndpoint> - <internalEndpoint> - <portName>push_consumer_t_data</portName> - <provider>true</provider> - <kind>Facet</kind> - <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" /> - </internalEndpoint> - </connection> - <connection> - <name>updater_one_connection</name> - <deployRequirement> - <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> - <resourceType>Local_Interface</resourceType> - </deployRequirement> - <internalEndpoint> - <portName>test_topic_one_update_data</portName> - <provider>false</provider> - <kind>SimplexReceptacle</kind> - <instance xmi:idref="SenderComponentInstance" /> - </internalEndpoint> - <internalEndpoint> - <portName>observable_t_data</portName> - <provider>true</provider> - <kind>Facet</kind> - <instance xmi:idref="MultipleTemp_ConnectorComponentInstance" /> - </internalEndpoint> - </connection> - - <connection> - <name>_listenercontrol_two</name> - <deployRequirement> - <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> - <resourceType>Local_Interface</resourceType> - </deployRequirement> - <internalEndpoint> - <portName>info_two_out_data_control</portName> - <provider>false</provider> - <kind>SimplexReceptacle</kind> - <instance xmi:idref="ReceiverComponentInstance" /> - </internalEndpoint> - <internalEndpoint> - <portName>push_consumer_y_data_control</portName> - <provider>true</provider> - <kind>Facet</kind> - <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" /> - </internalEndpoint> - </connection> - <connection> - <name>_statelistener_two</name> - <deployRequirement> - <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> - <resourceType>Local_Interface</resourceType> - </deployRequirement> - <internalEndpoint> - <portName>info_two_out_data_listener</portName> - <provider>true</provider> - <kind>Facet</kind> - <instance xmi:idref="ReceiverComponentInstance" /> - </internalEndpoint> - <internalEndpoint> - <portName>push_consumer_y_data_listener</portName> - <provider>false</provider> - <kind>SimplexReceptacle</kind> - <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" /> - </internalEndpoint> - </connection> - <!--connection> - <name>_portstatuslistener_two</name> - <deployRequirement> - <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> - <resourceType>Local_Interface</resourceType> - </deployRequirement> - <internalEndpoint> - <portName>info_two_out_status</portName> - <provider>true</provider> - <kind>Facet</kind> - <instance xmi:idref="ReceiverComponentInstance" /> - </internalEndpoint> - <internalEndpoint> - <portName>push_consumer_y_status</portName> - <provider>false</provider> - <kind>SimplexReceptacle</kind> - <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" /> - </internalEndpoint> - </connection--> - - <connection> - <name>info_two_out_data</name> - <deployRequirement> - <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> - <resourceType>Local_Interface</resourceType> - </deployRequirement> - <internalEndpoint> - <portName>info_two_out_data</portName> - <provider>false</provider> - <kind>SimplexReceptacle</kind> - <instance xmi:idref="ReceiverComponentInstance" /> - </internalEndpoint> - <internalEndpoint> - <portName>push_consumer_y_data</portName> - <provider>true</provider> - <kind>Facet</kind> - <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" /> - </internalEndpoint> - </connection> - <connection> - <name>updater_two_connection</name> - <deployRequirement> - <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> - <resourceType>Local_Interface</resourceType> - </deployRequirement> - <internalEndpoint> - <portName>test_topic_two_update_data</portName> - <provider>false</provider> - <kind>SimplexReceptacle</kind> - <instance xmi:idref="SenderComponentInstance" /> - </internalEndpoint> - <internalEndpoint> - <portName>observable_y_data</portName> - <provider>true</provider> - <kind>Facet</kind> - <instance xmi:idref="MultipleTemp_ConnectorComponentInstance" /> - </internalEndpoint> - </connection> - - <artifact xmi:id="Sender_ExecArtifact"> - <name>Sender_exec</name> - <source/> - <node/> - <location>Sender_exec</location> - </artifact> - <artifact xmi:id="Sender_SvntArtifact"> - <name>Sender_svnt</name> - <source/> - <node/> - <location>Sender_svnt</location> - </artifact> - <artifact xmi:id="Sender_StubArtifact"> - <name>Sender_stub</name> - <source/> - <node/> - <location>Sender_stub</location> - </artifact> - <artifact xmi:id="MultipleTemp_Connector_ExecArtifact"> - <name>DDS_MultipleTemp_Connector_exec</name> - <source/> - <node/> - <location>DDS_MultipleTemp_Connector_exec</location> - </artifact> - <artifact xmi:id="MultipleTemp_Connector_SvntArtifact"> - <name>DDS_MultipleTemp_Connector_svnt</name> - <source/> - <node/> - <location>DDS_MultipleTemp_Connector_svnt</location> - </artifact> - <artifact xmi:id="MultipleTemp_Connector_StubArtifact"> - <name>MultipleTemp_Connector_stub</name> - <source/> - <node/> - <location>DDS_MultipleTemp_Connector_stub</location> - </artifact> - - - <artifact xmi:id="Receiver_ExecArtifact"> - <name>Receiver_exec</name> - <source/> - <node/> - <location>Receiver_exec</location> - </artifact> - <artifact xmi:id="Receiver_SvntArtifact"> - <name>Receiver_svnt</name> - <source/> - <node/> - <location>Receiver_svnt</location> - </artifact> - <artifact xmi:id="Receiver_StubArtifact"> - <name>Receiver_stub</name> - <source/> - <node/> - <location>Receiver_stub</location> - </artifact> -</Deployment:DeploymentPlan> diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/run_test.pl deleted file mode 100755 index 638d55cd247..00000000000 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/run_test.pl +++ /dev/null @@ -1,243 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- 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 = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# 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"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -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 30 seconds to allow task to complete\n"; -sleep (30); - -# 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 -s\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; |