diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-01-20 12:11:28 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-01-20 12:11:28 +0000 |
| commit | 1ff84a46c62fb482bd62a384b34f4b9c1e7e2ca5 (patch) | |
| tree | 78fc0571a66bb48c5b2565e10ceef69cfe5afff2 /CIAO/connectors/dds4ccm | |
| parent | 6f8f4ebd99e45fe3e24a40c6cc7cf03bf8d31c24 (diff) | |
| download | ATCD-1ff84a46c62fb482bd62a384b34f4b9c1e7e2ca5.tar.gz | |
Merged RemedyWork branch.
ChangeLogTag: Thu Jan 20 11:42:53 UTC 2010 Martin Corino <mcorino@remedy.nl>
Diffstat (limited to 'CIAO/connectors/dds4ccm')
168 files changed, 3175 insertions, 2567 deletions
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h index 26b8a1ee437..f1d79e4a66d 100644 --- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h @@ -36,7 +36,7 @@ namespace CIAO_Hello_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); - // Operations and attributes from ::Hello::Listener + // Operations and attributes from Hello::Listener virtual void on_one_data ( @@ -66,7 +66,7 @@ namespace CIAO_Hello_Receiver_Impl Atomic_ULong &lost); virtual ~info_out_status_exec_i (void); - // Operations and attributes from ::CCM_DDS::PortStatusListener + // Operations and attributes from CCM_DDS::PortStatusListener virtual void on_requested_deadline_missed ( @@ -94,7 +94,7 @@ namespace CIAO_Hello_Receiver_Impl ::Hello::CCM_Receiver_Context_ptr ctx); virtual ~info_out_connector_status_exec_i (void); - // Operations and attributes from ::CCM_DDS::ConnectorStatusListener + // Operations and attributes from CCM_DDS::ConnectorStatusListener virtual void on_inconsistent_topic ( diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h index 0f2605ca785..7126b1daeb7 100644 --- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h @@ -32,7 +32,7 @@ namespace CIAO_Hello_Sender_Impl Atomic_Boolean &ready_to_start); virtual ~connector_status_exec_i (void); - // Operations and attributes from ::CCM_DDS::ConnectorStatusListener + // Operations and attributes from CCM_DDS::ConnectorStatusListener virtual void on_inconsistent_topic ( diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Connector.idl b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.idl index 799284b51fd..998079340e8 100755 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Connector.idl +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.idl @@ -1,18 +1,18 @@ // $Id$ /** - * @file I2C_Shapes_Connector.idl + * @file I2C_ShapeType.idl * @author */ -#ifndef I2C_SHAPES_CONNECTOR_IDL_ -#define I2C_SHAPES_CONNECTOR_IDL_ +#ifndef I2C_SHAPE_TYPE_IDL_ +#define I2C_SHAPE_TYPE_IDL_ #include "connectors/dds4ccm/idl/dds4ccm_Entity.idl" #include "Base/I2C_Shapes_Base.idl" -#pragma ciao lem "Connector/I2C_Shapes_ConnectorE.idl" +#pragma ciao lem "Base/I2C_ShapeTypeE.idl" module I2C_Typed <typename T, sequence<T> TSeq> { alias DDS_Entity<T, TSeq> DDS_Typed_Entity; @@ -22,6 +22,7 @@ module I2C_Typed <typename T, sequence<T> TSeq> { module ::I2C_Typed < ::ShapeType, ::ShapeTypeSeq> I2C_Shapes; -#endif /* I2C_SHAPES_CONNECTOR_IDL_ */ +#endif /* #ifndef I2C_SHAPE_TYPE_IDL_ + */ diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc new file mode 100755 index 00000000000..abc7169aee8 --- /dev/null +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc @@ -0,0 +1,79 @@ +// $Id$ + +project(I2C_ShapeType_idl_gen) : connectoridldefaults, ndds, ndds_stub { + after += DDS4CCM_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=I2C_SHAPES_CONNECTOR_STUB_Export \ + -Wb,stub_export_include=I2C_ShapeType_stub_export.h \ + -I.. + idlflags -= -Gcn -Gxhcn + IDL_Files { + I2C_ShapeType.idl + } +} + +project(I2C_ShapeType_lem_gen) : ciaoidldefaults, ndds_stub { + custom_only = 1 + after += I2C_ShapeType_idl_gen + idlflags += -Wb,stub_export_macro=I2C_SHAPES_CONNECTOR_LEM_STUB_Export \ + -Wb,stub_export_include=I2C_ShapeType_lem_stub_export.h \ + -SS -Gxhst \ + -I .. + + IDL_Files { + I2C_ShapeTypeE.idl + } +} + +project(I2C_ShapeType_lem_stub) : ndds_lem_stub { + after += I2C_ShapeType_lem_gen I2C_ShapeType_stub I2C_Shapes_Base_stub + libs += I2C_Shapes_Base_stub I2C_ShapeType_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = I2C_ShapeType_lem_stub + dynamicflags += I2C_SHAPES_CONNECTOR_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + I2C_ShapeTypeEC.cpp + } + + Header_Files { + I2C_ShapeTypeEC.h + I2C_ShapeType_lem_stub_export.h + } + + Inline_Files { + I2C_ShapeTypeEC.inl + } +} + +project(I2C_ShapeType_stub) : ndds_ts_default, ndds_stub { + after += I2C_ShapeType_idl_gen I2C_Shapes_Base_stub + libs += I2C_Shapes_Base_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = I2C_ShapeType_stub + dynamicflags += I2C_SHAPES_CONNECTOR_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + I2C_ShapeTypeC.cpp + } + + Header_Files { + I2C_ShapeTypeC.h + I2C_ShapeType_stub_export.h + I2C_Shapes_Traits.h + } + + Inline_Files { + I2C_ShapeTypeC.inl + } +} diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc index 708ea1bdd0f..b2c2b0e94d6 100755 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc @@ -1,6 +1,6 @@ // $Id$ -project(I2C_Shapes_Base_stub) : taoidldefaults, dds4ccm_ts_default { +project(I2C_Shapes_Base_stub) : taoidldefaults, ndds_ts_default { sharedname = I2C_Shapes_Base_stub dynamicflags += SHAPES_BASE_STUB_BUILD_DLL libout = ../lib diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Traits.h b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h index 369f1401842..626c77e6cf2 100755 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Traits.h +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h @@ -5,7 +5,7 @@ #define I2C_SHAPES_TRAITS_H_ #include "Base/I2C_Shapes_BaseSupport.h" -#include "Connector/I2C_Shapes_ConnectorC.h" +#include "Base/I2C_ShapeTypeC.h" struct ShapeType_DDS_Traits { diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp index 27f03b8e9cb..3061e3eff4a 100755 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp @@ -9,7 +9,6 @@ #define TOPIC_NAME "Square" - I2C_Shapes_Common::I2C_Shapes_Common (void) : factory_ (0) { @@ -27,10 +26,7 @@ I2C_Shapes_Common::I2C_Shapes_Common (void) I2C_Shapes_Common::~I2C_Shapes_Common (void) { - if (this->factory_) - { - delete this->factory_; - } + delete this->factory_; } int @@ -44,10 +40,9 @@ I2C_Shapes_Common::get_domain_id (void) void I2C_Shapes_Common::initialize (void) { - ::DDS::DomainParticipantQos dp_qos; - this->participant_ = this->participant_factory_.create_participant ( + this->participant_ = this->participant_factory_.create_participant_with_profile ( this->get_domain_id (), - dp_qos, + QOS_PROFILE, ::DDS::DomainParticipantListener::_nil (), 0); @@ -80,10 +75,9 @@ I2C_Shapes_Common::initialize (void) "I2C_Shapes_Common::initialize - Unable to register type\n")); throw ::CORBA::INTERNAL (); } - ::DDS::TopicQos tqos; - this->topic_ = this->participant_->create_topic (TOPIC_NAME, + this->topic_ = this->participant_->create_topic_with_profile (TOPIC_NAME, typesupport_name, - tqos, + QOS_PROFILE, ::DDS::TopicListener::_nil (), 0); if (::CORBA::is_nil (this->topic_.in ())) @@ -107,9 +101,8 @@ I2C_Shapes_Common::create_publisher (void) { initialize(); } - ::DDS::Publisher_var publisher; - ::DDS::PublisherQos pqos; - publisher = participant_->create_publisher (pqos, + ::DDS::Publisher_var publisher = participant_->create_publisher_with_profile ( + QOS_PROFILE, ::DDS::PublisherListener::_nil (), 0); return publisher._retn (); @@ -122,9 +115,8 @@ I2C_Shapes_Common::create_subscriber (void) { initialize(); } - ::DDS::Subscriber_var subscriber; - ::DDS::SubscriberQos sqos; - subscriber = participant_->create_subscriber (sqos, + ::DDS::Subscriber_var subscriber = participant_->create_subscriber_with_profile ( + QOS_PROFILE, ::DDS::SubscriberListener::_nil (), 0); return subscriber._retn (); diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h index 29efe23f274..665e89e6556 100755 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h @@ -4,15 +4,17 @@ #define I2C_SHAPES_COMMON_H_ #include "I2C_Shapes_Common_export.h" -#include "Connector/I2C_Shapes_Traits.h" #include "connectors/dds4ccm/impl/ndds/DomainParticipant.h" #include "connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h" #include "connectors/dds4ccm/impl/ndds/TypeSupport.h" +#include "Base/I2C_Shapes_Traits.h" /** * Pulse generator */ +#define QOS_PROFILE "Shapes_Library#Shapes_Profile" + class I2C_SHAPES_Export I2C_Shapes_Common { public: diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc index d326296f72e..2852e1beafc 100755 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc @@ -1,11 +1,11 @@ // $Id$ -project(I2C_Shapes_Common) : ndds_impl, dds4ccm_stub, dds4ccm_logger, dds4ccm_ts_default { +project(I2C_Shapes_Common) : ndds_impl, ndds_stub, dds4ccm_logger, ndds_ts_default { sharedname = I2C_Shapes_Common dynamicflags += I2C_SHAPES_COMMON_BUILD_DLL - after += I2C_Shapes_Base_stub I2C_Shapes_Connector_stub - libs += I2C_Shapes_Base_stub I2C_Shapes_Connector_stub + after += I2C_Shapes_Base_stub I2C_ShapeType_stub + libs += I2C_Shapes_Base_stub I2C_ShapeType_stub libout = ../lib libpaths += ../lib diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Connector.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Connector.mpc deleted file mode 100755 index cc80d6a0e61..00000000000 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Connector.mpc +++ /dev/null @@ -1,80 +0,0 @@ -// $Id$ - -// project(I2C_Shapes_Connector_idl_gen) : connectoridldefaults, dds4ccm { -project(I2C_Shapes_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=I2C_SHAPES_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=I2C_Shapes_Connector_stub_export.h \ - -I.. - idlflags -= -Gcn -Gxhcn - IDL_Files { - I2C_Shapes_Connector.idl - } -} - -project(I2C_Shapes_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += I2C_Shapes_Connector_idl_gen - idlflags += -Wb,stub_export_macro=I2C_SHAPES_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=I2C_Shapes_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - I2C_Shapes_ConnectorE.idl - } -} - -project(I2C_Shapes_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += I2C_Shapes_Connector_lem_gen I2C_Shapes_Connector_stub I2C_Shapes_Base_stub - libs += I2C_Shapes_Base_stub I2C_Shapes_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = I2C_Shapes_Connector_lem_stub - dynamicflags += I2C_SHAPES_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - I2C_Shapes_ConnectorEC.cpp - } - - Header_Files { - I2C_Shapes_ConnectorEC.h - I2C_Shapes_Connector_lem_stub_export.h - } - - Inline_Files { - I2C_Shapes_ConnectorEC.inl - } -} - -project(I2C_Shapes_Connector_stub) : ccm_stub, dds4ccm_base { - after += I2C_Shapes_Connector_idl_gen I2C_Shapes_Base_stub - libs += I2C_Shapes_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = I2C_Shapes_Connector_stub - dynamicflags += I2C_SHAPES_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - I2C_Shapes_ConnectorC.cpp - } - - Header_Files { - I2C_Shapes_ConnectorC.h - I2C_Shapes_Connector_stub_export.h - I2C_Shapes_Traits.h - } - - Inline_Files { - I2C_Shapes_ConnectorC.inl - } -} diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp index fb39c89d298..5eb637a19fd 100755 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp @@ -5,15 +5,10 @@ #include "ace/OS_NS_unistd.h" -typedef ::CIAO::NDDS::DataReader_T<ShapeType_DDS_Traits::datareader_type, - ShapeType_DDS_Traits::typed_reader_type, - ShapeType_DDS_Traits::value_type, - ShapeTypeSeq, - ShapeType_DDS_Traits::dds_seq_type> - ShapesDataReader; +typedef ::I2C_Shapes::DataReader TypedDataReader; void -read (ShapesDataReader* shapes_dr) +read (TypedDataReader::_ptr_type shapes_dr) { int samples_received = 0; if (shapes_dr) @@ -23,7 +18,7 @@ read (ShapesDataReader* shapes_dr) //start to read ShapeTypeSeq data; ::DDS::SampleInfoSeq info; - ::DDS::ReturnCode_t retcode = shapes_dr->read ( + ::DDS::ReturnCode_t retcode = shapes_dr->take ( data, info, ::DDS::LENGTH_UNLIMITED, @@ -74,15 +69,14 @@ int ACE_TMAIN (int , ACE_TCHAR *[]) } ::DDS::Topic_var topic = common.get_topic (); - ::DDS::DataReader_var dr; - ::DDS::DataReaderQos dqos; - dr = subscriber->create_datareader (topic.in (), - dqos, + ::DDS::DataReader_var dr = subscriber->create_datareader_with_profile ( + topic.in (), + QOS_PROFILE, ::DDS::DataReaderListener::_nil (), 0); - ShapesDataReader * shapes_dr = dynamic_cast <ShapesDataReader *>(dr.in ()); - read (shapes_dr); + TypedDataReader::_var_type shapes_dr = TypedDataReader::_narrow (dr.in ()); + read (shapes_dr.in ()); } catch (::CORBA::Exception &e) { diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc index 8e4b2a14897..e34f940b46a 100755 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc @@ -1,12 +1,12 @@ // $Id$ -project(*i2c_shapes_receiver) : ndds_impl, dds4ccm_stub, dds4ccm_ts_default { +project(*i2c_shapes_rec) : ndds_impl, ndds_stub, ndds_ts_default { exename = I2C_Shapes_Receiver - after += I2C_Shapes_Base_Stub I2C_Shapes_Connector_stub I2C_Shapes_Common + after += I2C_Shapes_Base_Stub I2C_ShapeType_stub I2C_Shapes_Common includes += .. $(CIAO_ROOT) $(CIAO_ROOT)/connectors - libs += I2C_Shapes_Base_stub I2C_Shapes_Connector_stub I2C_Shapes_Common + libs += I2C_Shapes_Base_stub I2C_ShapeType_stub I2C_Shapes_Common libpaths += ../lib exeout += ../lib diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp index ececa972aa3..d849a80f1bb 100755 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp @@ -7,13 +7,10 @@ #define MAX_X_Y 250 -typedef ::CIAO::NDDS::DataWriter_T<ShapeType_DDS_Traits::datawriter_type, - ShapeType_DDS_Traits::typed_writer_type, - ShapeType_DDS_Traits::value_type> - ShapesDataWriter; +typedef ::I2C_Shapes::DataWriter TypedDataWriter; void -write (ShapesDataWriter * shapes_dw) +write (TypedDataWriter::_ptr_type shapes_dw) { if (shapes_dw) { @@ -70,8 +67,7 @@ int ACE_TMAIN (int , ACE_TCHAR *[]) I2C_Shapes_Common common; try { - ::DDS::Publisher_var publisher; - publisher = common.create_publisher (); + ::DDS::Publisher_var publisher = common.create_publisher (); if (::CORBA::is_nil (publisher.in ())) { ACE_ERROR ((LM_ERROR, "ACE_TMAIN - Publisher seems to be nil\n")); @@ -79,14 +75,13 @@ int ACE_TMAIN (int , ACE_TCHAR *[]) } ::DDS::Topic_var topic = common.get_topic (); - ::DDS::DataWriter_var dw; - ::DDS::DataWriterQos wqos; - dw = publisher->create_datawriter (topic.in (), - wqos, + ::DDS::DataWriter_var dw = publisher->create_datawriter_with_profile ( + topic.in (), + QOS_PROFILE, ::DDS::DataWriterListener::_nil (), 0); - ShapesDataWriter * shapes_dw = dynamic_cast <ShapesDataWriter *>(dw.in ()); + TypedDataWriter::_var_type shapes_dw = TypedDataWriter::_narrow (dw.in ()); write (shapes_dw); } catch (::CORBA::Exception &e) diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc index 74935878905..6df7f441f7d 100755 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc @@ -1,13 +1,13 @@ // $Id$ -project(*i2c_shapes_sender) : ndds_impl, dds4ccm_stub, dds4ccm_ts_default { +project(*i2c_shapes_sender) : ndds_impl, ndds_stub, ndds_ts_default { exename = I2C_Shapes_Sender - after += I2C_Shapes_Base_Stub I2C_Shapes_Connector_stub I2C_Shapes_Common + after += I2C_Shapes_Base_Stub I2C_ShapeType_stub I2C_Shapes_Common includes += .. $(CIAO_ROOT) $(CIAO_ROOT)/connectors exeout += ../lib - libs += I2C_Shapes_Base_stub I2C_Shapes_Connector_stub I2C_Shapes_Common + libs += I2C_Shapes_Base_stub I2C_ShapeType_stub I2C_Shapes_Common libpaths += ../lib Source_Files { diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml new file mode 100644 index 00000000000..88a80a396e4 --- /dev/null +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + +Description +XML QoS Profile + +The QoS configuration of the DDS entities in the generated example is +loaded from this file. + +This file is used only when it is in the current working directory +or when the enviroment variable +NDDS_QOS_PROFILES is defined and points to this file. + +For more information about XML QoS Profiles see Chapter 15 in the +RTI Data Distribution Service user manual. +--> +<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d"> + <!-- QoS Library containing the QoS profile used in the generated example. + + A QoS library is a named set of QoS profiles. + --> + <qos_library name="Shapes_Library"> + <!-- QoS profile used to configure reliable communication between the DataWriter + and DataReader created in the example code. + + A QoS profile groups a set of related QoS. + --> + <qos_profile name="Shapes_Profile" is_default_qos="true"> + <!-- QoS used to configure the data writer created in the example code --> + <datawriter_qos> + <reliability> + <kind>RELIABLE_RELIABILITY_QOS</kind> + <max_blocking_time> + <sec>10</sec> + <nanosec>0</nanosec> + </max_blocking_time> + </reliability> + <durability> + <kind>TRANSIENT_DURABILITY_QOS</kind> + </durability> + <history> + <kind>KEEP_ALL_HISTORY_QOS</kind> + </history> + <protocol> + <rtps_reliable_writer> + <max_heartbeat_retries>10</max_heartbeat_retries> + </rtps_reliable_writer> + </protocol> + </datawriter_qos> + <!-- QoS used to configure the data reader created in the example code --> + <datareader_qos> + <reliability> + <kind>RELIABLE_RELIABILITY_QOS</kind> + </reliability> + <history> + <kind>KEEP_ALL_HISTORY_QOS</kind> + </history> + <durability> + <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind> + </durability> + </datareader_qos> + </qos_profile> + </qos_library> +</dds> diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h index 4f461606c02..5309e211c51 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h @@ -55,7 +55,7 @@ namespace CIAO_DDS_Sub_Impl Listener_exec_i (void); virtual ~Listener_exec_i (void); - // Operations and attributes from ::LargeTypeConn::Listener + // Operations and attributes from LargeTypeConn::Listener // TAO_IDL - Generated from // be/be_visitor_operation/operation_ch.cpp:37 @@ -85,7 +85,7 @@ namespace CIAO_DDS_Sub_Impl PortStatusListener_exec_i (void); virtual ~PortStatusListener_exec_i (void); - // Operations and attributes from ::CCM_DDS::PortStatusListener + // Operations and attributes from CCM_DDS::PortStatusListener // TAO_IDL - Generated from // be/be_visitor_operation/operation_ch.cpp:37 diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h index 830fd52f77e..cbe4bd81665 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h @@ -55,7 +55,7 @@ namespace CIAO_Single_Service_Impl Simple_Service_exec_i (void); virtual ~Simple_Service_exec_i (void); - // Operations and attributes from ::Simple_Service + // Operations and attributes from Simple_Service // TAO_IDL - Generated from // be/be_visitor_operation/operation_ch.cpp:37 diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h index 837f2c1aa3f..cbea0493206 100644 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h +++ b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h @@ -55,7 +55,7 @@ namespace CIAO_Quoter_Broker_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::Quoter::Listener. */ + /** Operations and attributes from Quoter::Listener. */ virtual void on_one_data (const ::Quoter::Stock_Info & datum, @@ -84,7 +84,7 @@ namespace CIAO_Quoter_Broker_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h index 1c26ec9adbb..0c4cfdb2d40 100644 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h +++ b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h @@ -78,7 +78,7 @@ namespace CIAO_Quoter_Distributor_Impl virtual ~info_out_connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc index 426e7b34e5f..4f0560a4fdd 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc @@ -11,7 +11,8 @@ project(DDS_Shapes_Receiver_idl_gen) : componentidldefaults, dds4ccm { -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.. + -Wb,exec_export_include=Receiver_exec_export.h \ + -I.. IDL_Files { Shapes_Receiver.idl @@ -83,9 +84,9 @@ project(DDS_Shapes_Receiver_stub) : ccm_stub, dds4ccm_base { } project(DDS_Shapes_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_Shapes_Receiver_lem_stub DDS_Shapes_Receiver_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub + after += DDS_Shapes_Receiver_lem_stub DDS_Shapes_Receiver_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -109,9 +110,9 @@ project(DDS_Shapes_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { project(DDS_Shapes_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_Shapes_Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt DDS_Shapes_Receiver_exec DDS_Shapes_Connector_lem_stub + after += DDS_Shapes_Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt DDS_Shapes_Receiver_exec DDS_Shapes_Connector_lem_stub sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt Receiver_exec DDS_Shapes_Connector_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt Receiver_exec DDS_Shapes_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp index d70f08e717b..a32b1a09c0b 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp @@ -1,17 +1,43 @@ // -*- C++ -*- // $Id$ +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 + * 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 "Shapes_Receiver_exec.h" -#include "ace/Log_Msg.h" #include "tao/ORB_Core.h" -#include "ace/OS_NS_time.h" #include "ace/Reactor.h" +#include "ace/OS_NS_time.h" + namespace CIAO_Shapes_Receiver_Impl { - //============================================================ - // read_action_Generator - //============================================================ + + /** + * Read action generator + */ + read_action_Generator::read_action_Generator (Receiver_exec_i &callback) : pulse_callback_ (callback) { @@ -32,87 +58,151 @@ namespace CIAO_Shapes_Receiver_Impl if (pulse_callback_.get_data ()) { this->pulse_callback_.get_one (); - this->pulse_callback_.get_all (); } return 0; } - //============================================================ - // ShapeType_Listener_exec_i - //============================================================ - ShapeType_Listener_exec_i::ShapeType_Listener_exec_i (void) + + /** + * Facet Executor Implementation Class: info_out_data_listener_exec_i + */ + + info_out_data_listener_exec_i::info_out_data_listener_exec_i ( + ::Shapes::CCM_Receiver_Context_ptr ctx) + : ciao_context_ ( + ::Shapes::CCM_Receiver_Context::_duplicate (ctx)) { } - ShapeType_Listener_exec_i::~ShapeType_Listener_exec_i (void) + info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) { } - // Operations from ::CCM_DDS::ShapeType_Listener + // Operations from ::Shapes::Listener + void - ShapeType_Listener_exec_i::on_many_data ( - const ShapeTypeSeq & /* an_instance */, - const ::CCM_DDS::ReadInfoSeq & /* info */) + info_out_data_listener_exec_i::on_one_data (const ::ShapeType & datum, + const ::CCM_DDS::ReadInfo & /* info */) { + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ShapeType_Listener: ") + ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"), + datum.color.in (), + datum.x, + datum.y, + datum.shapesize)); } void - ShapeType_Listener_exec_i::on_one_data ( - const ShapeType & an_instance , - const ::CCM_DDS::ReadInfo & /* info */) + info_out_data_listener_exec_i::on_many_data (const ::ShapeTypeSeq & /* data */, + const ::CCM_DDS::ReadInfoSeq & /* infos */) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ShapeType_Listener: ") - ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"), - an_instance.color.in (), - an_instance.x, - an_instance.y, - an_instance.shapesize)); + /* Your code here. */ } - //============================================================ - // PortStatusListener_exec_i - //============================================================ - PortStatusListener_exec_i::PortStatusListener_exec_i (void) + /** + * Facet Executor Implementation Class: info_out_status_exec_i + */ + + info_out_status_exec_i::info_out_status_exec_i ( + ::Shapes::CCM_Receiver_Context_ptr ctx) + : ciao_context_ ( + ::Shapes::CCM_Receiver_Context::_duplicate (ctx)) { } - PortStatusListener_exec_i::~PortStatusListener_exec_i (void) + info_out_status_exec_i::~info_out_status_exec_i (void) { } // Operations from ::CCM_DDS::PortStatusListener + void - PortStatusListener_exec_i::on_requested_deadline_missed ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) + info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, + const ::DDS::RequestedDeadlineMissedStatus & /* status */) { + /* Your code here. */ } void - PortStatusListener_exec_i::on_sample_lost ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) + info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, + const ::DDS::SampleLostStatus & /* status */) { + /* Your code here. */ } - //============================================================ - // Receiver_exec_i - //============================================================ - Receiver_exec_i::Receiver_exec_i (void) - : rate_ (0), - get_data_ (true), - read_data_ (true), - raw_listen_ (false) + /** + * Facet Executor Implementation Class: info_get_status_exec_i + */ + + info_get_status_exec_i::info_get_status_exec_i ( + ::Shapes::CCM_Receiver_Context_ptr ctx) + : ciao_context_ ( + ::Shapes::CCM_Receiver_Context::_duplicate (ctx)) + { + } + + info_get_status_exec_i::~info_get_status_exec_i (void) + { + } + // Operations from ::CCM_DDS::PortStatusListener + + void + info_get_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, + const ::DDS::RequestedDeadlineMissedStatus & /* status */) + { + /* Your code here. */ + } + + void + info_get_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, + const ::DDS::SampleLostStatus & /* status */) { - this->ticker_ = new read_action_Generator (*this); + /* Your code here. */ + } + + /** + * Component Executor Implementation Class: Receiver_exec_i + */ + + Receiver_exec_i::Receiver_exec_i (void) + : rate_ (0) + , get_data_ (true) + , read_data_ (true) + , raw_listen_ (false) + { + ACE_NEW_THROW_EX (this->ticker_, + read_action_Generator (*this), + ::CORBA::NO_MEMORY ()); } Receiver_exec_i::~Receiver_exec_i (void) { + delete this->ticker_; } // Supported operations and attributes. + ACE_Reactor* + Receiver_exec_i::reactor (void) + { + ACE_Reactor* reactor = 0; + ::CORBA::Object_var ccm_object = + this->ciao_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; + } + void Receiver_exec_i::read_one (void) { @@ -122,21 +212,31 @@ namespace CIAO_Shapes_Receiver_Impl try { - this->reader_->read_one_last (shape_info, readinfo, ::DDS::HANDLE_NIL); - time_t tim = readinfo.source_timestamp.sec; - tm* time = ACE_OS::localtime(&tim); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ONE Read_Info ") - ACE_TEXT (" -> date = %02d:%02d:%02d.%d\n"), - time->tm_hour, - time->tm_min, - time->tm_sec, - readinfo.source_timestamp.nanosec)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ON shape info : ") - ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"), - shape_info.color.in (), - shape_info.x, - shape_info.y, - shape_info.shapesize)); + ::Shapes::Reader_var reader = + this->ciao_context_->get_connection_info_out_data (); + if (! ::CORBA::is_nil (reader.in ())) + { + reader->read_one_last (shape_info, readinfo, ::DDS::HANDLE_NIL); + time_t tim = readinfo.source_timestamp.sec; + tm* time = ACE_OS::localtime(&tim); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ONE Read_Info ") + ACE_TEXT (" -> date = %02d:%02d:%02d.%d\n"), + time->tm_hour, + time->tm_min, + time->tm_sec, + readinfo.source_timestamp.nanosec)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ON shape info : ") + ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"), + shape_info.color.in (), + shape_info.x, + shape_info.y, + shape_info.shapesize)); + } + else + { + ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_one - " + "ERROR: reader seems to be nil.\n")); + } } catch(const CCM_DDS::NonExistent& ) { @@ -150,27 +250,37 @@ namespace CIAO_Shapes_Receiver_Impl { ShapeTypeSeq shape_infos; ::CCM_DDS::ReadInfoSeq readinfoseq; - this->reader_->read_all(shape_infos, readinfoseq); - for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i) + ::Shapes::Reader_var reader = + this->ciao_context_->get_connection_info_out_data (); + if (! ::CORBA::is_nil (reader.in ())) { - time_t tim = readinfoseq[i].source_timestamp.sec; - tm* time = ACE_OS::localtime(&tim); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ") - ACE_TEXT ("-> UTC date = %02d:%02d:%02d.%d\n"), - time->tm_hour, - time->tm_min, - time->tm_sec, - readinfoseq[i].source_timestamp.nanosec)); + reader->read_all(shape_infos, readinfoseq); + for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i) + { + time_t tim = readinfoseq[i].source_timestamp.sec; + tm* time = ACE_OS::localtime(&tim); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ") + ACE_TEXT ("-> UTC date = %02d:%02d:%02d.%d\n"), + time->tm_hour, + time->tm_min, + time->tm_sec, + readinfoseq[i].source_timestamp.nanosec)); + } + for(CORBA::ULong i = 0; i < shape_infos.length(); ++i) + { + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL Shape Info : ") + ACE_TEXT ("Number <%d> : received shape_info for <%C> at %u:%u:%u\n"), + i, + shape_infos[i].color.in (), + shape_infos[i].x, + shape_infos[i].y, + shape_infos[i].shapesize)); + } } - for(CORBA::ULong i = 0; i < shape_infos.length(); ++i) + else { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL Shape Info : ") - ACE_TEXT ("Number <%d> : received shape_info for <%C> at %u:%u:%u\n"), - i, - shape_infos[i].color.in (), - shape_infos[i].x, - shape_infos[i].y, - shape_infos[i].shapesize)); + ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_all - " + "ERROR: reader seems to be nil.\n")); } } @@ -182,27 +292,37 @@ namespace CIAO_Shapes_Receiver_Impl try { - if (this->getter_->get_one (shape_info.out (), readinfo.out ())) + ::Shapes::Getter_var getter = + this->ciao_context_->get_connection_info_get_fresh_data (); + if (! ::CORBA::is_nil (getter.in ())) { - time_t tim = readinfo->source_timestamp.sec; - tm* time = ACE_OS::localtime(&tim); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE ReadInfo -> ") - ACE_TEXT ("date = %02d:%02d:%02d.%d\n"), - time->tm_hour, - time->tm_min, - time->tm_sec, - readinfo->source_timestamp.nanosec)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE ShapeType : ") - ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"), - shape_info->color.in (), - shape_info->x, - shape_info->y, - shape_info->shapesize)); + if (getter->get_one (shape_info.out (), readinfo.out ())) + { + time_t tim = readinfo->source_timestamp.sec; + tm* time = ACE_OS::localtime(&tim); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE ReadInfo -> ") + ACE_TEXT ("date = %02d:%02d:%02d.%d\n"), + time->tm_hour, + time->tm_min, + time->tm_sec, + readinfo->source_timestamp.nanosec)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE ShapeType : ") + ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"), + shape_info->color.in (), + shape_info->x, + shape_info->y, + shape_info->shapesize)); + } + else + { + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE No data available for <%C>\n"), + shape_info->color.in ())); + } } else { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE No data available for <%C>\n"), - shape_info->color.in ())); + ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_one - " + "ERROR: Getter seems nil\n")); } } catch(const CCM_DDS::NonExistent& ) @@ -211,12 +331,68 @@ namespace CIAO_Shapes_Receiver_Impl } } - void - Receiver_exec_i::get_all (void) + // Component attributes and port operations. + + ::Shapes::CCM_Listener_ptr + Receiver_exec_i::get_info_out_data_listener (void) + { + if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ())) + { + info_out_data_listener_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + info_out_data_listener_exec_i ( + this->ciao_context_.in ()), + ::Shapes::CCM_Listener::_nil ()); + + this->ciao_info_out_data_listener_ = tmp; + } + + return + ::Shapes::CCM_Listener::_duplicate ( + this->ciao_info_out_data_listener_.in ()); + } + + ::CCM_DDS::CCM_PortStatusListener_ptr + Receiver_exec_i::get_info_out_status (void) + { + if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) + { + info_out_status_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + info_out_status_exec_i ( + this->ciao_context_.in ()), + ::CCM_DDS::CCM_PortStatusListener::_nil ()); + + this->ciao_info_out_status_ = tmp; + } + + return + ::CCM_DDS::CCM_PortStatusListener::_duplicate ( + this->ciao_info_out_status_.in ()); + } + + ::CCM_DDS::CCM_PortStatusListener_ptr + Receiver_exec_i::get_info_get_status (void) { + if ( ::CORBA::is_nil (this->ciao_info_get_status_.in ())) + { + info_get_status_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + info_get_status_exec_i ( + this->ciao_context_.in ()), + ::CCM_DDS::CCM_PortStatusListener::_nil ()); + + this->ciao_info_get_status_ = tmp; + } + + return + ::CCM_DDS::CCM_PortStatusListener::_duplicate ( + this->ciao_info_get_status_.in ()); } - // Component attributes. ::CORBA::ULong Receiver_exec_i::rate (void) { @@ -224,7 +400,8 @@ namespace CIAO_Shapes_Receiver_Impl } void - Receiver_exec_i::rate (::CORBA::ULong rate) + Receiver_exec_i::rate ( + const ::CORBA::ULong rate) { this->rate_ = rate; } @@ -236,7 +413,8 @@ namespace CIAO_Shapes_Receiver_Impl } void - Receiver_exec_i::get_data (::CORBA::Boolean get_data) + Receiver_exec_i::get_data ( + const ::CORBA::Boolean get_data) { this->get_data_ = get_data; } @@ -248,7 +426,8 @@ namespace CIAO_Shapes_Receiver_Impl } void - Receiver_exec_i::read_data (::CORBA::Boolean read_data) + Receiver_exec_i::read_data ( + const ::CORBA::Boolean read_data) { this->read_data_ = read_data; } @@ -260,41 +439,22 @@ namespace CIAO_Shapes_Receiver_Impl } void - Receiver_exec_i::raw_listen (::CORBA::Boolean raw_listen) + Receiver_exec_i::raw_listen ( + const ::CORBA::Boolean raw_listen) { this->raw_listen_ = raw_listen; } - // Port operations. - ::Shapes::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new ShapeType RAW listener\n"))); - return new ShapeType_Listener_exec_i (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n"))); - return new PortStatusListener_exec_i (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_get_status (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n"))); - return new PortStatusListener_exec_i (); - } - // Operations from Components::SessionComponent. + void Receiver_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { - this->context_ = + this->ciao_context_ = ::Shapes::CCM_Receiver_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->context_.in ())) + + if ( ::CORBA::is_nil (this->ciao_context_.in ())) { throw ::CORBA::INTERNAL (); } @@ -303,21 +463,14 @@ namespace CIAO_Shapes_Receiver_Impl void Receiver_exec_i::configuration_complete (void) { - if (this->read_data ()) - { - this->reader_ = this->context_->get_connection_info_out_data (); - } - if (this->get_data ()) - { - this->getter_ = this->context_->get_connection_info_get_fresh_data (); - } + /* Your code here. */ } void Receiver_exec_i::ccm_activate (void) { ::CCM_DDS::DataListenerControl_var lc = - this->context_->get_connection_info_out_data_control (); + this->ciao_context_->get_connection_info_out_data_control (); if (::CORBA::is_nil (lc.in ())) { @@ -329,8 +482,7 @@ namespace CIAO_Shapes_Receiver_Impl // calculate the interval time long const usec = 1000000 / this->rate_; - if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer ( - this->ticker_, + if (this->reactor ()->schedule_timer (this->ticker_, 0, ACE_Time_Value(0, usec), ACE_Time_Value(0, usec)) == -1) @@ -342,13 +494,13 @@ namespace CIAO_Shapes_Receiver_Impl void Receiver_exec_i::ccm_passivate (void) { - this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_); - delete this->ticker_; + this->reactor ()->cancel_timer (this->ticker_); } void Receiver_exec_i::ccm_remove (void) { + /* Your code here. */ } extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr @@ -364,4 +516,3 @@ namespace CIAO_Shapes_Receiver_Impl return retval; } } - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h index 791eb0750aa..4bdaaddbe1d 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h @@ -1,22 +1,47 @@ // -*- C++ -*- // $Id$ -#ifndef CIAO_RECEIVER_EXEC_H_ -#define CIAO_RECEIVER_EXEC_H_ +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 + * 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_SHAPES_RECEIVER_EXEC_4YQX0E_H_ +#define CIAO_SHAPES_RECEIVER_EXEC_4YQX0E_H_ + +#include /**/ "ace/pre.h" #include "Shapes_ReceiverEC.h" -#include /**/ "Receiver_exec_export.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include /**/ "Receiver_exec_export.h" #include "tao/LocalObject.h" namespace CIAO_Shapes_Receiver_Impl { class Receiver_exec_i; + /** * @class reader activity generator * @@ -39,47 +64,98 @@ namespace CIAO_Shapes_Receiver_Impl }; - //============================================================ - // ShapeType_Listener_exec_i - //============================================================ - class RECEIVER_EXEC_Export ShapeType_Listener_exec_i + /** + * Provider Executor Implementation Class: info_out_data_listener_exec_i + */ + + class info_out_data_listener_exec_i : public virtual ::Shapes::CCM_Listener, public virtual ::CORBA::LocalObject { public: - ShapeType_Listener_exec_i (void); - virtual ~ShapeType_Listener_exec_i (void); - - virtual void - on_one_data ( - const ShapeType & an_instance, - const ::CCM_DDS::ReadInfo & info); - virtual void - on_many_data ( - const ShapeTypeSeq & an_instance, - const ::CCM_DDS::ReadInfoSeq & info); + info_out_data_listener_exec_i ( + ::Shapes::CCM_Receiver_Context_ptr ctx); + virtual ~info_out_data_listener_exec_i (void); + + //@{ + /** Operations and attributes from Shapes::Listener. */ + + virtual + void on_one_data (const ::ShapeType & datum, + const ::CCM_DDS::ReadInfo & info); + + virtual + void on_many_data (const ::ShapeTypeSeq & data, + const ::CCM_DDS::ReadInfoSeq & infos); + //@} + + private: + ::Shapes::CCM_Receiver_Context_var ciao_context_; }; - class RECEIVER_EXEC_Export PortStatusListener_exec_i + /** + * Provider Executor Implementation Class: info_out_status_exec_i + */ + + class info_out_status_exec_i : public virtual ::CCM_DDS::CCM_PortStatusListener, public virtual ::CORBA::LocalObject { public: - PortStatusListener_exec_i (void); - virtual ~PortStatusListener_exec_i (void); - - virtual void - on_requested_deadline_missed ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual void - on_sample_lost ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); + info_out_status_exec_i ( + ::Shapes::CCM_Receiver_Context_ptr ctx); + virtual ~info_out_status_exec_i (void); + + //@{ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ + + virtual + void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, + const ::DDS::RequestedDeadlineMissedStatus & status); + + virtual + void on_sample_lost (::DDS::DataReader_ptr the_reader, + const ::DDS::SampleLostStatus & status); + //@} + + private: + ::Shapes::CCM_Receiver_Context_var ciao_context_; }; - class RECEIVER_EXEC_Export Receiver_exec_i + /** + * Provider Executor Implementation Class: info_get_status_exec_i + */ + + class info_get_status_exec_i + : public virtual ::CCM_DDS::CCM_PortStatusListener, + public virtual ::CORBA::LocalObject + { + public: + info_get_status_exec_i ( + ::Shapes::CCM_Receiver_Context_ptr ctx); + virtual ~info_get_status_exec_i (void); + + //@{ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ + + virtual + void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, + const ::DDS::RequestedDeadlineMissedStatus & status); + + virtual + void on_sample_lost (::DDS::DataReader_ptr the_reader, + const ::DDS::SampleLostStatus & status); + //@} + + private: + ::Shapes::CCM_Receiver_Context_var ciao_context_; + }; + + /** + * Component Executor Implementation Class: Receiver_exec_i + */ + + class Receiver_exec_i : public virtual Receiver_Exec, public virtual ::CORBA::LocalObject { @@ -87,13 +163,23 @@ namespace CIAO_Shapes_Receiver_Impl Receiver_exec_i (void); virtual ~Receiver_exec_i (void); - // Supported operations and attributes. - void read_one (void); - void read_all (void); - void get_one (void); - void get_all (void); + //@{ + /** Supported operations and attributes. */ + + //@} + + //@{ + /** Component attributes and port operations. */ + + virtual ::Shapes::CCM_Listener_ptr + get_info_out_data_listener (void); + + virtual ::CCM_DDS::CCM_PortStatusListener_ptr + get_info_out_status (void); + + virtual ::CCM_DDS::CCM_PortStatusListener_ptr + get_info_get_status (void); - // Component attributes. virtual ::CORBA::ULong rate (void); virtual void rate (::CORBA::ULong rate); @@ -109,41 +195,62 @@ namespace CIAO_Shapes_Receiver_Impl virtual ::CORBA::Boolean raw_listen (void); virtual void raw_listen (::CORBA::Boolean raw_listen); + //@} - // Port operations. - virtual ::Shapes::CCM_Listener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_get_status (void); - - // Operations from Components::SessionComponent. - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); - + //@{ + /** 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. */ + void read_one (void); + void read_all (void); + void get_one (void); + + //@} private: - ::Shapes::CCM_Receiver_Context_var context_; - ::Shapes::Reader_var reader_; - ::Shapes::Getter_var getter_; + ::Shapes::CCM_Receiver_Context_var ciao_context_; + + //@{ + /** Component attributes. */ + ::Shapes::CCM_Listener_var ciao_info_out_data_listener_; + ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; + ::CCM_DDS::CCM_PortStatusListener_var ciao_info_get_status_; + + ::CORBA::ULong rate_; + ::CORBA::Boolean get_data_; + + ::CORBA::Boolean read_data_; + + ::CORBA::Boolean raw_listen_; + //@} + + //@{ + /** User defined members. */ read_action_Generator * ticker_; - CORBA::ULong rate_; - ::CORBA::Boolean get_data_, read_data_, raw_listen_; + + //@} + + //@{ + /** User defined private operations. */ + + //@} + + /// Get the ACE_Reactor + ACE_Reactor* reactor (void); }; extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shape_Receiver_Impl (void); + create_Shapes_Receiver_Impl (void); } -#endif /* ifndef */ +#include /**/ "ace/post.h" +#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc index 4623d3ddb8d..d079f2047d1 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc @@ -12,7 +12,7 @@ project(DDS_Shapes_Sender_idl_gen) : componentidldefaults, dds4ccm { -Wb,svnt_export_include=Sender_svnt_export.h \ -Wb,exec_export_macro=SENDER_EXEC_Export \ -Wb,exec_export_include=Sender_exec_export.h \ - -I .. + -I.. IDL_Files { Shapes_Sender.idl diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp index e217f27ed8f..acb84bcd5e6 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp @@ -1,17 +1,41 @@ // -*- C++ -*- // $Id$ +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 + * 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 "Shapes_Sender_exec.h" -#include "ace/Guard_T.h" -#include "ace/Log_Msg.h" #include "tao/ORB_Core.h" #include "ace/Reactor.h" namespace CIAO_Shapes_Sender_Impl { - //============================================================ - // pulse_Generator - //============================================================ + + /** + * Write action generator + */ + pulse_Generator::pulse_Generator (Sender_exec_i &callback) : pulse_callback_ (callback) { @@ -28,85 +52,128 @@ namespace CIAO_Shapes_Sender_Impl return 0; } - //============================================================ - // Sender_exec_i - //============================================================ + + /** + * Component Executor Implementation Class: Sender_exec_i + */ + Sender_exec_i::Sender_exec_i (void) - : rate_ (1), - max_x_ (100), - max_y_ (100), - max_size_ (25), - resize_ (false), - x_increasing_ (false), - y_increasing_ (false), - size_increasing_ (false) + : rate_ (1) + , max_x_ (100) + , max_y_ (100) + , max_size_ (25) + , resize_shape_ (false) + , x_increasing_ (false) + , y_increasing_ (false) + , size_increasing_ (false) { - square_ = new ShapeType; - this->ticker_ = new pulse_Generator (*this); + ACE_NEW_THROW_EX (this->ticker_, + pulse_Generator (*this), + ::CORBA::NO_MEMORY ()); + ACE_NEW_THROW_EX (this->square_, + ShapeType, + ::CORBA::NO_MEMORY ()); + + this->square_->x = ACE_OS::rand () % this->max_x_; + this->square_->y = ACE_OS::rand () % this->max_y_; + this->square_->shapesize = max_size_; + this->square_->color = CORBA::string_dup("GREEN"); } Sender_exec_i::~Sender_exec_i (void) { + delete this->ticker_; + delete this->square_; } // Supported operations and attributes. + ACE_Reactor* + Sender_exec_i::reactor (void) + { + ACE_Reactor* reactor = 0; + ::CORBA::Object_var ccm_object = + this->ciao_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; + } void Sender_exec_i::tick () { if (this->x_increasing_) { - ++square_->x; - this->x_increasing_ = square_->x + 1 <= this->max_x_; + ++this->square_->x; + this->x_increasing_ = this->square_->x + 1 <= this->max_x_; } else { - --square_->x; - this->x_increasing_ = square_->x - 1 < 0; + --this->square_->x; + this->x_increasing_ = this->square_->x - 1 < 0; } if (this->y_increasing_) { - ++square_->y; - this->y_increasing_ = square_->y + 1 <= this->max_y_; + ++this->square_->y; + this->y_increasing_ = this->square_->y + 1 <= this->max_y_; } else { - --square_->y; - this->y_increasing_ = square_->y - 1 < 0; + --this->square_->y; + this->y_increasing_ = this->square_->y - 1 < 0; } if (resize_shape ()) { if (this->size_increasing_) { - ++square_->shapesize; - this->size_increasing_ = square_->shapesize + 1 <= this->max_size_; + ++this->square_->shapesize; + this->size_increasing_ = this->square_->shapesize + 1 <= this->max_size_; } else { - --square_->shapesize; - this->size_increasing_ = square_->shapesize - 1 < 0; + --this->square_->shapesize; + this->size_increasing_ = this->square_->shapesize - 1 < 0; } } try { - this->writer_->write_one (*square_, this->instance_handle_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("UPDATED Shape_info for <%C> %u:%u:%u\n"), - square_->color.in (), - square_->x, - square_->y, - square_->shapesize)); + Shapes::Writer_var writer = + this->ciao_context_->get_connection_info_write_data (); + if (! ::CORBA::is_nil (writer.in ())) + { + writer->write_one (*this->square_, this->instance_handle_); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("UPDATED Shape_info for <%C> %u:%u:%u\n"), + this->square_->color.in (), + this->square_->x, + this->square_->y, + this->square_->shapesize)); + } + else + { + ACE_ERROR ((LM_ERROR, "Sender_exec_i::tick - " + "ERROR: Writer seems nil.\n")); + } } catch (const CCM_DDS::NonExistent& ) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Shape_info for <%C> not updated: <%C> didn't exist.\n"), - square_->color.in (), square_->color.in ())); + this->square_->color.in (), this->square_->color.in ())); } catch (const CCM_DDS::InternalError& ) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while updating Shape_info for <%C>.\n"), - square_->color.in ())); + this->square_->color.in ())); } } @@ -115,7 +182,7 @@ namespace CIAO_Shapes_Sender_Impl { // calculate the interval time long const usec = 1000000 / this->rate_; - if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer ( + if (this->reactor ()->schedule_timer ( this->ticker_, 0, ACE_Time_Value (0, usec), @@ -129,27 +196,38 @@ namespace CIAO_Shapes_Sender_Impl void Sender_exec_i::stop (void) { - this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_); + this->reactor ()->cancel_timer (this->ticker_); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n"))); try { - this->writer_->unregister_instance (*this->square_, this->instance_handle_); + Shapes::Writer_var writer = + this->ciao_context_->get_connection_info_write_data (); + if (! ::CORBA::is_nil (writer.in ())) + { + writer->unregister_instance (*this->square_, + this->instance_handle_); + } + else + { + ACE_ERROR ((LM_ERROR, "Sender_exec_i::stop - " + "ERROR: Writer seems nil.\n")); + } } catch (const CCM_DDS::NonExistent& ) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Shape_info for <%C> not deleted: <%C> didn't exist.\n"), - square_->color.in (), square_->color.in ())); + this->square_->color.in (), this->square_->color.in ())); } catch (const CCM_DDS::InternalError& ) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while deleting Shape_info for <%C>.\n"), - square_->color.in ())); + this->square_->color.in ())); } - delete this->ticker_; - delete this->square_; } + // Component attributes and port operations. + ::CORBA::ULong Sender_exec_i::rate (void) { @@ -157,7 +235,8 @@ namespace CIAO_Shapes_Sender_Impl } void - Sender_exec_i::rate (::CORBA::ULong rate) + Sender_exec_i::rate ( + const ::CORBA::ULong rate) { this->rate_ = rate; } @@ -169,7 +248,8 @@ namespace CIAO_Shapes_Sender_Impl } void - Sender_exec_i::max_x (::CORBA::UShort max_x) + Sender_exec_i::max_x ( + const ::CORBA::UShort max_x) { this->max_x_ = max_x; } @@ -181,7 +261,8 @@ namespace CIAO_Shapes_Sender_Impl } void - Sender_exec_i::max_y (::CORBA::UShort max_y) + Sender_exec_i::max_y ( + const ::CORBA::UShort max_y) { this->max_y_ = max_y; } @@ -193,30 +274,35 @@ namespace CIAO_Shapes_Sender_Impl } void - Sender_exec_i::max_size (::CORBA::UShort max_size) + Sender_exec_i::max_size ( + const ::CORBA::UShort max_size) { this->max_size_ = max_size; } - void - Sender_exec_i::resize_shape (::CORBA::Boolean resize) + ::CORBA::Boolean + Sender_exec_i::resize_shape (void) { - this->resize_ = resize; + return this->resize_shape_; } - ::CORBA::Boolean - Sender_exec_i::resize_shape () + void + Sender_exec_i::resize_shape ( + const ::CORBA::Boolean resize_shape) { - return this->resize_; + this->resize_shape_ = resize_shape; } + // Operations from Components::SessionComponent. + void - Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx) + Sender_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) { - this->context_ = + this->ciao_context_ = ::Shapes::CCM_Sender_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->context_.in ())) + if ( ::CORBA::is_nil (this->ciao_context_.in ())) { throw ::CORBA::INTERNAL (); } @@ -225,37 +311,43 @@ namespace CIAO_Shapes_Sender_Impl void Sender_exec_i::configuration_complete (void) { - this->writer_ = this->context_->get_connection_info_write_data (); } void Sender_exec_i::ccm_activate (void) { this->start (); - square_->x = ACE_OS::rand () % this->max_x_; - square_->y = ACE_OS::rand () % this->max_y_; - square_->shapesize = max_size_; - square_->color = CORBA::string_dup("GREEN"); //Register shape with dds. ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("REGISTER Shape_info for <%C> %u:%u:%u\n"), - square_->color.in (), - square_->x, - square_->y, - square_->shapesize)); + this->square_->color.in (), + this->square_->x, + this->square_->y, + this->square_->shapesize)); try { - this->instance_handle_ = this->writer_->register_instance (*square_); + Shapes::Writer_var writer = + this->ciao_context_->get_connection_info_write_data (); + if (! ::CORBA::is_nil (writer.in ())) + { + this->instance_handle_ = + writer->register_instance (*this->square_); + } + else + { + ACE_ERROR ((LM_ERROR, "Sender_exec_i::ccm_activate - " + "ERROR: Writer seems nil.\n")); + } } catch (const CCM_DDS::AlreadyCreated& ) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Shape_info for <%C> already created.\n"), - square_->color.in ())); + this->square_->color.in ())); } catch (const CCM_DDS::InternalError& ) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating Shape_info for <%C>.\n"), - square_->color.in ())); + this->square_->color.in ())); } } @@ -268,10 +360,11 @@ namespace CIAO_Shapes_Sender_Impl void Sender_exec_i::ccm_remove (void) { + /* Your code here. */ } extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shape_Sender_Impl (void) + create_Shapes_Sender_Impl (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); @@ -283,4 +376,3 @@ namespace CIAO_Shapes_Sender_Impl return retval; } } - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h index 88405a59f6a..3ce05bd7147 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h @@ -1,26 +1,51 @@ // -*- C++ -*- // $Id$ -#ifndef CIAO_SENDER_EXEC_H_ -#define CIAO_SENDER_EXEC_H_ +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 + * 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_SHAPES_SENDER_EXEC_ETSDUL_H_ +#define CIAO_SHAPES_SENDER_EXEC_ETSDUL_H_ + +#include /**/ "ace/pre.h" #include "Shapes_SenderEC.h" -#include /**/ "Sender_exec_export.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include /**/ "Sender_exec_export.h" #include "tao/LocalObject.h" namespace CIAO_Shapes_Sender_Impl { class Sender_exec_i; - //============================================================ - // pulse_Generator - //============================================================ + /** + * Write action generator + */ + class pulse_Generator : public ACE_Event_Handler { public: @@ -34,9 +59,10 @@ namespace CIAO_Shapes_Sender_Impl Sender_exec_i &pulse_callback_; }; - //============================================================ - // Sender_exec_i - //============================================================ + /** + * Component Executor Implementation Class: Sender_exec_i + */ + class Sender_exec_i : public virtual Sender_Exec, public virtual ::CORBA::LocalObject @@ -45,6 +71,14 @@ namespace CIAO_Shapes_Sender_Impl Sender_exec_i (void); virtual ~Sender_exec_i (void); + //@{ + /** Supported operations and attributes. */ + + //@} + + //@{ + /** Component attributes and port operations. */ + virtual ::CORBA::ULong rate (void); virtual void rate (::CORBA::ULong rate); @@ -61,33 +95,49 @@ namespace CIAO_Shapes_Sender_Impl virtual void max_size (::CORBA::UShort max_size); - virtual void resize_shape (::CORBA::Boolean resize); - virtual ::CORBA::Boolean resize_shape (void); - virtual void set_session_context (::Components::SessionContext_ptr ctx); + virtual void resize_shape (::CORBA::Boolean resize_shape); + //@} + //@{ + /** 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. */ + void tick (void); - void tick (); + //@} private: + ::Shapes::CCM_Sender_Context_var ciao_context_; + + //@{ + /** Component attributes. */ + + ::CORBA::ULong rate_; + + ::CORBA::UShort max_x_; + + ::CORBA::UShort max_y_; + + ::CORBA::UShort max_size_; + + ::CORBA::Boolean resize_shape_; + //@} + + //@{ + /** User defined members. */ void start (void); void stop (void); - Shapes::Writer_var writer_; - pulse_Generator * ticker_; - ::Shapes::CCM_Sender_Context_var context_; - CORBA::ULong rate_; - CORBA::UShort max_x_; - CORBA::UShort max_y_; - CORBA::UShort max_size_; - CORBA::Boolean resize_; bool x_increasing_; bool y_increasing_; @@ -96,11 +146,22 @@ namespace CIAO_Shapes_Sender_Impl ShapeType* square_; ::DDS::InstanceHandle_t instance_handle_; + + //@} + + //@{ + /** User defined private operations. */ + + //@} + + /// Get the ACE_Reactor + ACE_Reactor* reactor (void); }; extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shape_Sender_Impl (void); + create_Shapes_Sender_Impl (void); } -#endif /* ifndef */ +#include /**/ "ace/post.h" +#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp index 6b930249ff4..f339fe38722 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp @@ -123,7 +123,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Shape_Sender_Impl</string> + <string>create_Shapes_Sender_Impl</string> </value> </value> </execParameter> diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc index 1dbac3237be..7ec1ea30161 100644 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc +++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc @@ -1,3 +1,4 @@ +// -*- MPC -*- // $Id$ project (DDS4CCM_lem_gen) : install, dds4ccm, ciaoidldefaults { @@ -19,7 +20,6 @@ project (DDS4CCM_lem_gen) : install, dds4ccm, ciaoidldefaults { dds4ccm_ConnectorStatusListenerE.idl dds4ccm_StateListenerControlE.idl dds4ccm_ConnectorE.idl - dds_rtf2_dcps_i_handleE.idl } } @@ -41,7 +41,6 @@ project (DDS4CCM_lem_stub) : install, dds4ccm, ccm_lem_stub, ccm_session_stub, c dds4ccm_ConnectorStatusListenerEC.cpp dds4ccm_StateListenerControlEC.cpp dds4ccm_ConnectorEC.cpp - dds_rtf2_dcps_i_handleEC.cpp } Header_Files { diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc index 6f3c29a7991..113d1b6ddbf 100644 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc +++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc @@ -23,6 +23,5 @@ project (DDS4CCM_skel) : install, dds4ccm_lem_stub, ciaolib_with_idl, ciao_outpu dds4ccm_ConnectorStatusListenerS.cpp dds4ccm_ConnectorS.cpp dds4ccm_StateListenerControlS.cpp - dds_rtf2_dcps_i_handleS.cpp } } diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc index 346a87ef292..0df4d54f307 100644 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc +++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc @@ -23,7 +23,6 @@ project (DDS4CCM_idl_gen) : install, dds4ccm, componentidldefaults { IDL_Files { idlflags -= -Gxhst -Gxhsk dds_rtf2_dcps.idl - dds_rtf2_dcps_i_handle.idl dds4ccm_PortStatusListener.idl dds4ccm_DataListenerControl.idl dds4ccm_ConnectorStatusListener.idl @@ -58,8 +57,6 @@ project (DDS4CCM_stub) : install, dds4ccm, ccm_stub, ciaolib_with_idl, ciao_outp dds4ccm_StateListenerControlC.cpp dds4ccm_ConnectorC.cpp dds_rtf2_dcpsC.cpp - dds_rtf2_dcps_i_handleC.cpp - dds_rtf2_dcps_instance_handleC.cpp } } diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl index d66348dd399..a8f4638b45f 100644 --- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl +++ b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl @@ -3,1145 +3,12 @@ #ifndef DDS_RFT2_DCPS_IDL #define DDS_RFT2_DCPS_IDL -#pragma ciao lem "connectors/dds4ccm/idl/dds_rtf2_dcpsE.idl" - #if (CIAO_DDS4CCM_OPENDDS==1) # include "dds/DdsDcps.idl" #endif #if (CIAO_DDS4CCM_NDDS==1) -# define DOMAINID_TYPE_NATIVE long -# define HANDLE_TYPE_NATIVE long -# define HANDLE_NIL_NATIVE 0 -# define BUILTIN_TOPIC_KEY_TYPE_NATIVE long - -#define TheParticipantFactory -#define PARTICIPANT_QOS_DEFAULT -#define TOPIC_QOS_DEFAULT -#define PUBLISHER_QOS_DEFAULT -#define SUBSCRIBER_QOS_DEFAULT -#define DATAWRITER_QOS_DEFAULT -#define DATAREADER_QOS_DEFAULT -#define DATAWRITER_QOS_USE_TOPIC_QOS -#define DATAREADER_QOS_USE_TOPIC_QOS - -#include "tao/StringSeq.pidl" -#include "connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl" - -module DDS { - typedef long DomainId_t; - typedef long long_3[3]; - - struct BuiltinTopicKey_t { - long_3 value; - }; - - typedef long ReturnCode_t; - typedef long QosPolicyId_t; - typedef sequence<string> StringSeq; - - struct Duration_t { - long sec; - unsigned long nanosec; - }; - - struct Time_t { - long sec; - unsigned long nanosec; - }; - - // ---------------------------------------------------------------------- - // Pre-defined values - // ---------------------------------------------------------------------- - //const InstanceHandle_t HANDLE_NIL = 0; - - const long LENGTH_UNLIMITED = -1; - - const long DURATION_INFINITE_SEC = 0x7fffffff; - const unsigned long DURATION_INFINITE_NSEC = 0x7fffffff; - - const long DURATION_ZERO_SEC = 0; - const unsigned long DURATION_ZERO_NSEC = 0; - - const long TIME_INVALID_SEC = -1; - const unsigned long TIME_INVALID_NSEC = 0xffffffff; - - // ---------------------------------------------------------------------- - // Return codes - // ---------------------------------------------------------------------- - const ReturnCode_t RETCODE_OK = 0; - const ReturnCode_t RETCODE_ERROR = 1; - const ReturnCode_t RETCODE_UNSUPPORTED = 2; - const ReturnCode_t RETCODE_BAD_PARAMETER = 3; - const ReturnCode_t RETCODE_PRECONDITION_NOT_MET = 4; - const ReturnCode_t RETCODE_OUT_OF_RESOURCES = 5; - const ReturnCode_t RETCODE_NOT_ENABLED = 6; - const ReturnCode_t RETCODE_IMMUTABLE_POLICY = 7; - const ReturnCode_t RETCODE_INCONSISTENT_POLICY = 8; - const ReturnCode_t RETCODE_ALREADY_DELETED = 9; - const ReturnCode_t RETCODE_TIMEOUT = 10; - const ReturnCode_t RETCODE_NO_DATA = 11; - const ReturnCode_t RETCODE_ILLEGAL_OPERATION = 12; - - // ---------------------------------------------------------------------- - // Status to support listeners and conditions - // ---------------------------------------------------------------------- - - typedef unsigned long StatusKind; - typedef unsigned long StatusMask; // bit-mask StatusKind - - const StatusKind INCONSISTENT_TOPIC_STATUS = 0x0001 << 0; - const StatusKind OFFERED_DEADLINE_MISSED_STATUS = 0x0001 << 1; - const StatusKind REQUESTED_DEADLINE_MISSED_STATUS = 0x0001 << 2; - const StatusKind OFFERED_INCOMPATIBLE_QOS_STATUS = 0x0001 << 5; - const StatusKind REQUESTED_INCOMPATIBLE_QOS_STATUS = 0x0001 << 6; - const StatusKind SAMPLE_LOST_STATUS = 0x0001 << 7; - const StatusKind SAMPLE_REJECTED_STATUS = 0x0001 << 8; - const StatusKind DATA_ON_READERS_STATUS = 0x0001 << 9; - const StatusKind DATA_AVAILABLE_STATUS = 0x0001 << 10; - const StatusKind LIVELINESS_LOST_STATUS = 0x0001 << 11; - const StatusKind LIVELINESS_CHANGED_STATUS = 0x0001 << 12; - const StatusKind PUBLICATION_MATCHED_STATUS = 0x0001 << 13; - const StatusKind SUBSCRIPTION_MATCHED_STATUS = 0x0001 << 14; - const StatusKind RELIABLE_WRITER_CACHE_CHANGED_STATUS = 0x00000001 << 24; - const StatusKind RELIABLE_READER_ACTIVITY_CHANGED_STATUS = 0x00000001 << 25; - - struct InconsistentTopicStatus { - long total_count; - long total_count_change; - }; - - struct SampleLostStatus { - long total_count; - long total_count_change; - }; - - enum SampleRejectedStatusKind { - NOT_REJECTED, - REJECTED_BY_INSTANCES_LIMIT, - REJECTED_BY_SAMPLES_LIMIT, - REJECTED_BY_SAMPLES_PER_INSTANCE_LIMIT - }; - - struct SampleRejectedStatus { - long total_count; - long total_count_change; - SampleRejectedStatusKind last_reason; - InstanceHandle_t last_instance_handle; - }; - - struct LivelinessLostStatus { - long total_count; - long total_count_change; - }; - - struct LivelinessChangedStatus { - long alive_count; - long not_alive_count; - long alive_count_change; - long not_alive_count_change; - InstanceHandle_t last_publication_handle; - }; - - struct OfferedDeadlineMissedStatus { - long total_count; - long total_count_change; - InstanceHandle_t last_instance_handle; - }; - - struct RequestedDeadlineMissedStatus { - long total_count; - long total_count_change; - InstanceHandle_t last_instance_handle; - }; - - struct QosPolicyCount { - QosPolicyId_t policy_id; - long count; - }; - - typedef sequence<QosPolicyCount> QosPolicyCountSeq; - - struct OfferedIncompatibleQosStatus { - long total_count; - long total_count_change; - QosPolicyId_t last_policy_id; - QosPolicyCountSeq policies; - }; - - struct RequestedIncompatibleQosStatus { - long total_count; - long total_count_change; - QosPolicyId_t last_policy_id; - QosPolicyCountSeq policies; - }; - - struct PublicationMatchedStatus { - long total_count; - long total_count_change; - long current_count; - long current_count_change; - InstanceHandle_t last_subscription_handle; - }; - - struct SubscriptionMatchedStatus { - long total_count; - long total_count_change; - long current_count; - long current_count_change; - InstanceHandle_t last_publication_handle; - }; - - struct ReliableReaderActivityChangedStatus { - long active_count; - long inactive_count; - long active_count_change; - long inactive_count_change; - InstanceHandle_t last_instance_handle; - }; - - struct ReliableWriterCacheEventCount { - long total_count; - long total_count_change; - }; - - struct ReliableWriterCacheChangedStatus { - ReliableWriterCacheEventCount empty_reliable_writer_cache; - ReliableWriterCacheEventCount full_reliable_writer_cache; - ReliableWriterCacheEventCount low_watermark_reliable_writer_cache; - ReliableWriterCacheEventCount high_watermark_reliable_writer_cache; - long unacknowledged_sample_count; - long unacknowledged_sample_count_peak; - }; - - // ---------------------------------------------------------------------- - // Listeners - // ---------------------------------------------------------------------- - - local interface Listener; - local interface Entity; - local interface TopicDescription; - local interface Topic; - local interface ContentFilteredTopic; - local interface MultiTopic; - local interface DataWriter; - local interface DataReader; - local interface Subscriber; - local interface Publisher; - - typedef sequence<DataReader> DataReaderSeq; - - local interface Listener {}; - - local interface TopicListener : Listener { - void on_inconsistent_topic(in Topic the_topic, - in InconsistentTopicStatus status); - }; - - local interface DataWriterListener : Listener { - void on_offered_deadline_missed( - in DataWriter writer, - in OfferedDeadlineMissedStatus status); - void on_offered_incompatible_qos( - in DataWriter writer, - in OfferedIncompatibleQosStatus status); - void on_liveliness_lost( - in DataWriter writer, - in LivelinessLostStatus status); - void on_publication_matched( - in DataWriter writer, - in PublicationMatchedStatus status); - void on_reliable_writer_cache_changed ( - in DataWriter writer, - in ReliableWriterCacheChangedStatus status); - void on_reliable_reader_activity_changed ( - in DataWriter writer, - in ReliableReaderActivityChangedStatus status); - }; - - local interface PublisherListener : DataWriterListener { - }; - - local interface DataReaderListener : Listener { - void on_requested_deadline_missed( - in DataReader the_reader, - in RequestedDeadlineMissedStatus status); - void on_requested_incompatible_qos( - in DataReader the_reader, - in RequestedIncompatibleQosStatus status); - void on_sample_rejected( - in DataReader the_reader, - in SampleRejectedStatus status); - void on_liveliness_changed( - in DataReader the_reader, - in LivelinessChangedStatus status); - void on_data_available( - in DataReader the_reader); - void on_subscription_matched( - in DataReader the_reader, - in SubscriptionMatchedStatus status); - void on_sample_lost( - in DataReader the_reader, - in SampleLostStatus status); - }; - - local interface SubscriberListener : DataReaderListener { - void on_data_on_readers( - in Subscriber the_subscriber); - }; - - - local interface DomainParticipantListener : TopicListener, - PublisherListener, - SubscriberListener { - }; - - - // ---------------------------------------------------------------------- - // Conditions - // ---------------------------------------------------------------------- - - local interface Condition { - boolean get_trigger_value(); - }; - - typedef sequence<Condition> ConditionSeq; - - local interface WaitSet { - ReturnCode_t wait( - inout ConditionSeq active_conditions, - in Duration_t timeout); - ReturnCode_t attach_condition( - in Condition cond); - ReturnCode_t detach_condition( - in Condition cond); - ReturnCode_t get_conditions( - inout ConditionSeq attached_conditions); - }; - - local interface GuardCondition : Condition { - ReturnCode_t set_trigger_value( - in boolean value); - }; - - local interface StatusCondition : Condition { - StatusMask get_enabled_statuses(); - ReturnCode_t set_enabled_statuses( - in StatusMask mask); - Entity get_entity(); - }; - - // Sample states to support reads - typedef unsigned long SampleStateKind; - const SampleStateKind READ_SAMPLE_STATE = 0x0001 << 0; - const SampleStateKind NOT_READ_SAMPLE_STATE = 0x0001 << 1; - - // This is a bit-mask SampleStateKind - typedef unsigned long SampleStateMask; - const SampleStateMask ANY_SAMPLE_STATE = 0xffff; - - // View states to support reads - typedef unsigned long ViewStateKind; - const ViewStateKind NEW_VIEW_STATE = 0x0001 << 0; - const ViewStateKind NOT_NEW_VIEW_STATE = 0x0001 << 1; - - // This is a bit-mask ViewStateKind - typedef unsigned long ViewStateMask; - const ViewStateMask ANY_VIEW_STATE = 0xffff; - - // Instance states to support reads - typedef unsigned long InstanceStateKind; - const InstanceStateKind ALIVE_INSTANCE_STATE = 0x0001 << 0; - const InstanceStateKind NOT_ALIVE_DISPOSED_INSTANCE_STATE = 0x0001 << 1; - const InstanceStateKind NOT_ALIVE_NO_WRITERS_INSTANCE_STATE = 0x0001 << 2; - - // This is a bit-mask InstanceStateKind - typedef unsigned long InstanceStateMask; - const InstanceStateMask ANY_INSTANCE_STATE = 0xffff; - const InstanceStateMask NOT_ALIVE_INSTANCE_STATE = 0x006; - - - local interface ReadCondition : Condition { - SampleStateMask get_sample_state_mask(); - ViewStateMask get_view_state_mask(); - InstanceStateMask get_instance_state_mask(); - DataReader get_datareader(); - }; - - local interface QueryCondition : ReadCondition { - string get_query_expression(); - ReturnCode_t get_query_parameters( - inout StringSeq query_parameters); - ReturnCode_t set_query_parameters( - in StringSeq query_parameters); - }; - - // ---------------------------------------------------------------------- - // Qos - // ---------------------------------------------------------------------- - const string USERDATA_QOS_POLICY_NAME = "UserData"; - const string DURABILITY_QOS_POLICY_NAME = "Durability"; - const string PRESENTATION_QOS_POLICY_NAME = "Presentation"; - const string DEADLINE_QOS_POLICY_NAME = "Deadline"; - const string LATENCYBUDGET_QOS_POLICY_NAME = "LatencyBudget"; - const string OWNERSHIP_QOS_POLICY_NAME = "Ownership"; - const string OWNERSHIPSTRENGTH_QOS_POLICY_NAME = "OwnershipStrength"; - const string LIVELINESS_QOS_POLICY_NAME = "Liveliness"; - const string TIMEBASEDFILTER_QOS_POLICY_NAME = "TimeBasedFilter"; - const string PARTITION_QOS_POLICY_NAME = "Partition"; - const string RELIABILITY_QOS_POLICY_NAME = "Reliability"; - const string DESTINATIONORDER_QOS_POLICY_NAME = "DestinationOrder"; - const string HISTORY_QOS_POLICY_NAME = "History"; - const string RESOURCELIMITS_QOS_POLICY_NAME = "ResourceLimits"; - const string ENTITYFACTORY_QOS_POLICY_NAME = "EntityFactory"; - const string WRITERDATALIFECYCLE_QOS_POLICY_NAME = "WriterDataLifecycle"; - const string READERDATALIFECYCLE_QOS_POLICY_NAME = "ReaderDataLifecycle"; - const string TOPICDATA_QOS_POLICY_NAME = "TopicData"; - const string GROUPDATA_QOS_POLICY_NAME = "TransportPriority"; - const string LIFESPAN_QOS_POLICY_NAME = "Lifespan"; - const string DURABILITYSERVICE_POLICY_NAME = "DurabilityService"; - - const QosPolicyId_t INVALID_QOS_POLICY_ID = 0; - const QosPolicyId_t USERDATA_QOS_POLICY_ID = 1; - const QosPolicyId_t DURABILITY_QOS_POLICY_ID = 2; - const QosPolicyId_t PRESENTATION_QOS_POLICY_ID = 3; - const QosPolicyId_t DEADLINE_QOS_POLICY_ID = 4; - const QosPolicyId_t LATENCYBUDGET_QOS_POLICY_ID = 5; - const QosPolicyId_t OWNERSHIP_QOS_POLICY_ID = 6; - const QosPolicyId_t OWNERSHIPSTRENGTH_QOS_POLICY_ID = 7; - const QosPolicyId_t LIVELINESS_QOS_POLICY_ID = 8; - const QosPolicyId_t TIMEBASEDFILTER_QOS_POLICY_ID = 9; - const QosPolicyId_t PARTITION_QOS_POLICY_ID = 10; - const QosPolicyId_t RELIABILITY_QOS_POLICY_ID = 11; - const QosPolicyId_t DESTINATIONORDER_QOS_POLICY_ID = 12; - const QosPolicyId_t HISTORY_QOS_POLICY_ID = 13; - const QosPolicyId_t RESOURCELIMITS_QOS_POLICY_ID = 14; - const QosPolicyId_t ENTITYFACTORY_QOS_POLICY_ID = 15; - const QosPolicyId_t WRITERDATALIFECYCLE_QOS_POLICY_ID = 16; - const QosPolicyId_t READERDATALIFECYCLE_QOS_POLICY_ID = 17; - const QosPolicyId_t TOPICDATA_QOS_POLICY_ID = 18; - const QosPolicyId_t GROUPDATA_QOS_POLICY_ID = 19; - const QosPolicyId_t TRANSPORTPRIORITY_QOS_POLICY_ID = 20; - const QosPolicyId_t LIFESPAN_QOS_POLICY_ID = 21; - const QosPolicyId_t DURABILITYSERVICE_QOS_POLICY_ID = 22; - - typedef sequence<octet> OctetSeq; - struct UserDataQosPolicy { - OctetSeq value; - }; - - struct TopicDataQosPolicy { - OctetSeq value; - }; - - struct GroupDataQosPolicy { - OctetSeq value; - }; - - struct TransportPriorityQosPolicy { - long value; - }; - - struct LifespanQosPolicy { - Duration_t duration; - }; - - enum DurabilityQosPolicyKind { - VOLATILE_DURABILITY_QOS, - TRANSIENT_LOCAL_DURABILITY_QOS, - TRANSIENT_DURABILITY_QOS, - PERSISTENT_DURABILITY_QOS - }; - struct DurabilityQosPolicy { - DurabilityQosPolicyKind kind; - }; - - enum PresentationQosPolicyAccessScopeKind { - INSTANCE_PRESENTATION_QOS, - TOPIC_PRESENTATION_QOS, - GROUP_PRESENTATION_QOS - }; - struct PresentationQosPolicy { - PresentationQosPolicyAccessScopeKind access_scope; - boolean coherent_access; - boolean ordered_access; - }; - - struct DeadlineQosPolicy { - Duration_t period; - }; - - struct LatencyBudgetQosPolicy { - Duration_t duration; - }; - - enum OwnershipQosPolicyKind { - SHARED_OWNERSHIP_QOS, - EXCLUSIVE_OWNERSHIP_QOS - }; - struct OwnershipQosPolicy { - OwnershipQosPolicyKind kind; - }; - - struct OwnershipStrengthQosPolicy { - long value; - }; - - enum LivelinessQosPolicyKind { - AUTOMATIC_LIVELINESS_QOS, - MANUAL_BY_PARTICIPANT_LIVELINESS_QOS, - MANUAL_BY_TOPIC_LIVELINESS_QOS - }; - - struct LivelinessQosPolicy { - LivelinessQosPolicyKind kind; - Duration_t lease_duration; - }; - - struct TimeBasedFilterQosPolicy { - Duration_t minimum_separation; - }; - - struct PartitionQosPolicy { - StringSeq name; - }; - - enum ReliabilityQosPolicyKind { - BEST_EFFORT_RELIABILITY_QOS, - RELIABLE_RELIABILITY_QOS - }; - - struct ReliabilityQosPolicy { - ReliabilityQosPolicyKind kind; - Duration_t max_blocking_time; - }; - - enum DestinationOrderQosPolicyKind { - BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS, - BY_SOURCE_TIMESTAMP_DESTINATIONORDER_QOS - }; - struct DestinationOrderQosPolicy { - DestinationOrderQosPolicyKind kind; - }; - - enum HistoryQosPolicyKind { - KEEP_LAST_HISTORY_QOS, - KEEP_ALL_HISTORY_QOS - }; - struct HistoryQosPolicy { - HistoryQosPolicyKind kind; - long depth; - }; - - struct ResourceLimitsQosPolicy { - long max_samples; - long max_instances; - long max_samples_per_instance; - }; - - struct EntityFactoryQosPolicy { - boolean autoenable_created_entities; - }; - - struct WriterDataLifecycleQosPolicy { - boolean autodispose_unregistered_instances; - }; - - struct ReaderDataLifecycleQosPolicy { - Duration_t autopurge_nowriter_samples_delay; - Duration_t autopurge_disposed_samples_delay; - }; - - struct DurabilityServiceQosPolicy { - Duration_t service_cleanup_delay; - HistoryQosPolicyKind history_kind; - long history_depth; - long max_samples; - long max_instances; - long max_samples_per_instance; - }; - - struct DomainParticipantFactoryQos { - EntityFactoryQosPolicy entity_factory; - }; - - struct DomainParticipantQos { - UserDataQosPolicy user_data; - EntityFactoryQosPolicy entity_factory; - }; - - struct TopicQos { - TopicDataQosPolicy topic_data; - DurabilityQosPolicy durability; - DurabilityServiceQosPolicy durability_service; - DeadlineQosPolicy deadline; - LatencyBudgetQosPolicy latency_budget; - LivelinessQosPolicy liveliness; - ReliabilityQosPolicy reliability; - DestinationOrderQosPolicy destination_order; - HistoryQosPolicy history; - ResourceLimitsQosPolicy resource_limits; - TransportPriorityQosPolicy transport_priority; - LifespanQosPolicy lifespan; - - OwnershipQosPolicy ownership; - }; - - struct DataWriterQos { - DurabilityQosPolicy durability; - DurabilityServiceQosPolicy durability_service; - DeadlineQosPolicy deadline; - LatencyBudgetQosPolicy latency_budget; - LivelinessQosPolicy liveliness; - ReliabilityQosPolicy reliability; - DestinationOrderQosPolicy destination_order; - HistoryQosPolicy history; - ResourceLimitsQosPolicy resource_limits; - TransportPriorityQosPolicy transport_priority; - LifespanQosPolicy lifespan; - - UserDataQosPolicy user_data; - OwnershipQosPolicy ownership; - OwnershipStrengthQosPolicy ownership_strength; - WriterDataLifecycleQosPolicy writer_data_lifecycle; - }; - - struct PublisherQos { - PresentationQosPolicy presentation; - PartitionQosPolicy partition; - GroupDataQosPolicy group_data; - EntityFactoryQosPolicy entity_factory; - }; - - struct DataReaderQos { - DurabilityQosPolicy durability; - DeadlineQosPolicy deadline; - LatencyBudgetQosPolicy latency_budget; - LivelinessQosPolicy liveliness; - ReliabilityQosPolicy reliability; - DestinationOrderQosPolicy destination_order; - HistoryQosPolicy history; - ResourceLimitsQosPolicy resource_limits; - - UserDataQosPolicy user_data; - OwnershipQosPolicy ownership; - TimeBasedFilterQosPolicy time_based_filter; - ReaderDataLifecycleQosPolicy reader_data_lifecycle; - }; - - struct SubscriberQos { - PresentationQosPolicy presentation; - PartitionQosPolicy partition; - GroupDataQosPolicy group_data; - EntityFactoryQosPolicy entity_factory; - }; - - // ---------------------------------------------------------------------- - - struct ParticipantBuiltinTopicData { - BuiltinTopicKey_t key; - UserDataQosPolicy user_data; - }; - - struct TopicBuiltinTopicData { - BuiltinTopicKey_t key; - string name; - string type_name; - DurabilityQosPolicy durability; - DurabilityServiceQosPolicy durability_service; - DeadlineQosPolicy deadline; - LatencyBudgetQosPolicy latency_budget; - LivelinessQosPolicy liveliness; - ReliabilityQosPolicy reliability; - TransportPriorityQosPolicy transport_priority; - LifespanQosPolicy lifespan; - DestinationOrderQosPolicy destination_order; - HistoryQosPolicy history; - ResourceLimitsQosPolicy resource_limits; - OwnershipQosPolicy ownership; - TopicDataQosPolicy topic_data; - }; - - struct PublicationBuiltinTopicData { - BuiltinTopicKey_t key; - BuiltinTopicKey_t participant_key; - string topic_name; - string type_name; - - DurabilityQosPolicy durability; - DurabilityServiceQosPolicy durability_service; - DeadlineQosPolicy deadline; - LatencyBudgetQosPolicy latency_budget; - LivelinessQosPolicy liveliness; - ReliabilityQosPolicy reliability; - LifespanQosPolicy lifespan; - UserDataQosPolicy user_data; - OwnershipQosPolicy ownership; - OwnershipStrengthQosPolicy ownership_strength; - DestinationOrderQosPolicy destination_order; - - PresentationQosPolicy presentation; - PartitionQosPolicy partition; - TopicDataQosPolicy topic_data; - GroupDataQosPolicy group_data; - }; - - struct SubscriptionBuiltinTopicData { - BuiltinTopicKey_t key; - BuiltinTopicKey_t participant_key; - string topic_name; - string type_name; - - DurabilityQosPolicy durability; - DeadlineQosPolicy deadline; - LatencyBudgetQosPolicy latency_budget; - LivelinessQosPolicy liveliness; - ReliabilityQosPolicy reliability; - OwnershipQosPolicy ownership; - DestinationOrderQosPolicy destination_order; - UserDataQosPolicy user_data; - TimeBasedFilterQosPolicy time_based_filter; - - PresentationQosPolicy presentation; - PartitionQosPolicy partition; - TopicDataQosPolicy topic_data; - GroupDataQosPolicy group_data; - }; - - // ---------------------------------------------------------------------- - local interface Entity { - // ReturnCode_t set_qos( - // in EntityQos qos); - // ReturnCode_t get_qos( - // inout EntityQos qos); - // ReturnCode_t set_listener( - // in Listener l, - // in StatusMask mask); - // Listener get_listener(); - - ReturnCode_t enable(); - - StatusCondition get_statuscondition(); - - StatusMask get_status_changes(); - - InstanceHandle_t get_instance_handle(); - }; - - // ---------------------------------------------------------------------- - local interface DomainParticipant : Entity { - // Factory interfaces - Publisher create_publisher( - in PublisherQos qos, - in PublisherListener a_listener, - in StatusMask mask); - Publisher create_publisher_with_profile( - in string library_name, - in string profile_name, - in PublisherListener a_listener, - in StatusMask mask); - ReturnCode_t delete_publisher( - in Publisher p); - - Subscriber create_subscriber( - in SubscriberQos qos, - in SubscriberListener a_listener, - in StatusMask mask); - Subscriber create_subscriber_with_profile( - in string library_name, - in string profile_name, - in SubscriberListener a_listener, - in StatusMask mask); - ReturnCode_t delete_subscriber( - in Subscriber s); - Subscriber get_builtin_subscriber(); - - Topic create_topic( - in string topic_name, - in string type_name, - in TopicQos qos, - in TopicListener a_listener, - in StatusMask mask); - Topic create_topic_with_profile( - in string topic_name, - in string type_name, - in string library_name, - in string profile_name, - in TopicListener a_listener, - in StatusMask mask); - - ReturnCode_t delete_topic( - in Topic a_topic); - - Topic find_topic( - in string topic_name, - in Duration_t timeout); - TopicDescription lookup_topicdescription( - in string name); - - ContentFilteredTopic create_contentfilteredtopic( - in string name, - in Topic related_topic, - in string filter_expression, - in StringSeq expression_parameters); - - ReturnCode_t delete_contentfilteredtopic( - in ContentFilteredTopic a_contentfilteredtopic); - - MultiTopic create_multitopic( - in string name, - in string type_name, - in string subscription_expression, - in StringSeq expression_parameters); - - ReturnCode_t delete_multitopic( - in MultiTopic a_multitopic); - - ReturnCode_t delete_contained_entities(); - - ReturnCode_t set_qos( - in DomainParticipantQos qos); - ReturnCode_t get_qos( - inout DomainParticipantQos qos); - - ReturnCode_t set_listener( - in DomainParticipantListener a_listener, - in StatusMask mask); - DomainParticipantListener get_listener(); - - ReturnCode_t ignore_participant( - in InstanceHandle_t handle); - ReturnCode_t ignore_topic( - in InstanceHandle_t handle); - ReturnCode_t ignore_publication( - in InstanceHandle_t handle); - ReturnCode_t ignore_subscription( - in InstanceHandle_t handle); - - DomainId_t get_domain_id(); - ReturnCode_t assert_liveliness(); - - ReturnCode_t set_default_publisher_qos( - in PublisherQos qos); - ReturnCode_t get_default_publisher_qos( - inout PublisherQos qos); - - ReturnCode_t set_default_subscriber_qos( - in SubscriberQos qos); - ReturnCode_t get_default_subscriber_qos( - inout SubscriberQos qos); - - ReturnCode_t set_default_topic_qos( - in TopicQos qos); - ReturnCode_t get_default_topic_qos( - inout TopicQos qos); - - ReturnCode_t get_discovered_participants( - inout InstanceHandleSeq participant_handles); - ReturnCode_t get_discovered_participant_data( - inout ParticipantBuiltinTopicData participant_data, - in InstanceHandle_t participant_handle); - - ReturnCode_t get_discovered_topics( - inout InstanceHandleSeq topic_handles); - ReturnCode_t get_discovered_topic_data( - inout TopicBuiltinTopicData topic_data, - in InstanceHandle_t topic_handle); - - boolean contains_entity( - in InstanceHandle_t a_handle); - - ReturnCode_t get_current_time( - inout Time_t current_time); - }; - - local interface DomainParticipantFactory { - DomainParticipant create_participant( - in DomainId_t domain_id, - in DomainParticipantQos qos, - in DomainParticipantListener a_listener, - in StatusMask mask); - DomainParticipant create_participant_with_profile( - in DomainId_t domain_id, - in string library_name, - in string profile_name, - in DomainParticipantListener a_listener, - in StatusMask mask); - ReturnCode_t delete_participant( - in DomainParticipant a_participant); - - DomainParticipant lookup_participant( - in DomainId_t domain_id); - - ReturnCode_t set_default_participant_qos( - in DomainParticipantQos qos); - ReturnCode_t set_default_participant_qos_with_profile( - in string library_name, - in string profile_name); - ReturnCode_t get_default_participant_qos( - inout DomainParticipantQos qos); - - ReturnCode_t set_qos( - in DomainParticipantFactoryQos qos); - ReturnCode_t get_qos( - inout DomainParticipantFactoryQos qos); - }; - - local interface TypeSupport { - ReturnCode_t register_type( - in DomainParticipant domain, - in string type_name); - string get_type_name(); - }; - - // ---------------------------------------------------------------------- - local interface TopicDescription { - string get_type_name(); - string get_name(); - - DomainParticipant get_participant(); - }; - - local interface Topic : Entity, TopicDescription { - ReturnCode_t set_qos( - in TopicQos qos); - ReturnCode_t get_qos( - inout TopicQos qos); - ReturnCode_t set_listener( - in TopicListener a_listener, - in StatusMask mask); - TopicListener get_listener(); - // Access the status - ReturnCode_t get_inconsistent_topic_status( - inout InconsistentTopicStatus a_status); - }; - - local interface ContentFilteredTopic : TopicDescription { - string get_filter_expression(); - ReturnCode_t get_expression_parameters( - inout StringSeq expression_parameters); - ReturnCode_t set_expression_parameters( - in StringSeq expression_parameters); - Topic get_related_topic(); - }; - - local interface MultiTopic : TopicDescription { - string get_subscription_expression(); - ReturnCode_t get_expression_parameters( - inout StringSeq expression_parameters); - ReturnCode_t set_expression_parameters( - in StringSeq expression_parameters); - }; - - // ---------------------------------------------------------------------- - local interface Publisher : Entity { - DataWriter create_datawriter( - in Topic a_topic, - in DataWriterQos qos, - in DataWriterListener a_listener, - in StatusMask mask); - DataWriter create_datawriter_with_profile( - in Topic a_topic, - in string library_name, - in string probile_name, - in DataWriterListener a_listener, - in StatusMask mask); - ReturnCode_t delete_datawriter( - in DataWriter a_datawriter); - DataWriter lookup_datawriter( - in string topic_name); - - ReturnCode_t delete_contained_entities(); - - ReturnCode_t set_qos( - in PublisherQos qos); - ReturnCode_t get_qos( - inout PublisherQos qos); - - ReturnCode_t set_listener( - in PublisherListener a_listener, - in StatusMask mask); - PublisherListener get_listener(); - - ReturnCode_t suspend_publications(); - ReturnCode_t resume_publications(); - - ReturnCode_t begin_coherent_changes(); - ReturnCode_t end_coherent_changes(); - - ReturnCode_t wait_for_acknowledgments( - in Duration_t max_wait); - - DomainParticipant get_participant(); - - ReturnCode_t set_default_datawriter_qos( - in DataWriterQos qos); - ReturnCode_t get_default_datawriter_qos( - inout DataWriterQos qos); - - ReturnCode_t copy_from_topic_qos( - inout DataWriterQos a_datawriter_qos, - in TopicQos a_topic_qos); - }; - - local interface DataWriter : Entity { - ReturnCode_t set_qos( - in DataWriterQos qos); - ReturnCode_t get_qos( - inout DataWriterQos qos); - - ReturnCode_t set_listener( - in DataWriterListener a_listener, - in StatusMask mask); - DataWriterListener get_listener(); - - Topic get_topic(); - Publisher get_publisher(); - - ReturnCode_t wait_for_acknowledgments( - in Duration_t max_wait); - - // Access the status - ReturnCode_t get_liveliness_lost_status( - inout LivelinessLostStatus status); - ReturnCode_t get_offered_deadline_missed_status( - inout OfferedDeadlineMissedStatus status); - ReturnCode_t get_offered_incompatible_qos_status( - inout OfferedIncompatibleQosStatus status); - ReturnCode_t get_publication_matched_status( - inout PublicationMatchedStatus status); - - ReturnCode_t assert_liveliness(); - - ReturnCode_t get_matched_subscriptions( - inout InstanceHandleSeq subscription_handles); - ReturnCode_t get_matched_subscription_data( - inout SubscriptionBuiltinTopicData subscription_data, - in InstanceHandle_t subscription_handle); - }; - - // ---------------------------------------------------------------------- - local interface Subscriber : Entity { - DataReader create_datareader( - in TopicDescription a_topic, - in DataReaderQos qos, - in DataReaderListener a_listener, - in StatusMask mask); - DataReader create_datareader_with_profile( - in TopicDescription a_topic, - in string library_name, - in string profile_name, - in DataReaderListener a_listener, - in StatusMask mask); - ReturnCode_t delete_datareader( - in DataReader a_datareader); - ReturnCode_t delete_contained_entities(); - DataReader lookup_datareader( - in string topic_name); - ReturnCode_t get_datareaders( - inout DataReaderSeq readers, - in SampleStateMask sample_states, - in ViewStateMask view_states, - in InstanceStateMask instance_states); - ReturnCode_t notify_datareaders(); - - ReturnCode_t set_qos( - in SubscriberQos qos); - ReturnCode_t get_qos( - inout SubscriberQos qos); - - ReturnCode_t set_listener( - in SubscriberListener a_listener, - in StatusMask mask); - SubscriberListener get_listener(); - - ReturnCode_t begin_access(); - ReturnCode_t end_access(); - - DomainParticipant get_participant(); - - ReturnCode_t set_default_datareader_qos( - in DataReaderQos qos); - ReturnCode_t get_default_datareader_qos( - inout DataReaderQos qos); - - ReturnCode_t copy_from_topic_qos( - inout DataReaderQos a_datareader_qos, - in TopicQos a_topic_qos); - }; - - local interface DataReader : Entity { - ReadCondition create_readcondition( - in SampleStateMask sample_states, - in ViewStateMask view_states, - in InstanceStateMask instance_states); - - QueryCondition create_querycondition( - in SampleStateMask sample_states, - in ViewStateMask view_states, - in InstanceStateMask instance_states, - in string query_expression, - in StringSeq query_parameters); - - ReturnCode_t delete_readcondition( - in ReadCondition a_condition); - - ReturnCode_t delete_contained_entities(); - - ReturnCode_t set_qos( - in DataReaderQos qos); - ReturnCode_t get_qos( - inout DataReaderQos qos); - - ReturnCode_t set_listener( - in DataReaderListener a_listener, - in StatusMask mask); - DataReaderListener get_listener(); - - TopicDescription get_topicdescription(); - Subscriber get_subscriber(); - - ReturnCode_t get_sample_rejected_status( - inout SampleRejectedStatus status); - ReturnCode_t get_liveliness_changed_status( - inout LivelinessChangedStatus status); - ReturnCode_t get_requested_deadline_missed_status( - inout RequestedDeadlineMissedStatus status); - ReturnCode_t get_requested_incompatible_qos_status( - inout RequestedIncompatibleQosStatus status); - ReturnCode_t get_subscription_matched_status( - inout SubscriptionMatchedStatus status); - ReturnCode_t get_sample_lost_status( - inout SampleLostStatus status); - - ReturnCode_t wait_for_historical_data( - in Duration_t max_wait); - - ReturnCode_t get_matched_publications( - inout InstanceHandleSeq publication_handles); - ReturnCode_t get_matched_publication_data( - inout PublicationBuiltinTopicData publication_data, - in InstanceHandle_t publication_handle); - }; - - struct SampleInfo { - SampleStateKind sample_state; - ViewStateKind view_state; - InstanceStateKind instance_state; - Time_t source_timestamp; - InstanceHandle_t instance_handle; - InstanceHandle_t publication_handle; - long disposed_generation_count; - long no_writers_generation_count; - long sample_rank; - long generation_rank; - long absolute_generation_rank; - boolean valid_data; - }; - - typedef sequence<SampleInfo> SampleInfoSeq; -}; - +# include "connectors/dds4ccm/idl/ndds/ndds_dcps.idl" #endif #endif diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl deleted file mode 100644 index 2a65d5db3e6..00000000000 --- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl +++ /dev/null @@ -1,14 +0,0 @@ -// $Id$ - -#ifndef DDS_RFT2_DCPS_INSTANCE_HANDLE_IDL -#define DDS_RFT2_DCPS_INSTANCE_HANDLE_IDL - -#include "connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl" - -#if (CIAO_DDS4CCM_NDDS==1) -module DDS { - native HANDLE_NIL; -}; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl new file mode 100644 index 00000000000..cdc361cbe1f --- /dev/null +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl @@ -0,0 +1,1134 @@ +// $Id$ + +#ifndef NDDS_DCPS_IDL +#define NDDS_DCPS_IDL + +#pragma ciao lem "connectors/dds4ccm/idl/ndds/ndds_dcpsE.idl" + + +# define DOMAINID_TYPE_NATIVE long +# define HANDLE_TYPE_NATIVE long +# define HANDLE_NIL_NATIVE 0 +# define BUILTIN_TOPIC_KEY_TYPE_NATIVE long + +#define TheParticipantFactory +#define PARTICIPANT_QOS_DEFAULT +#define TOPIC_QOS_DEFAULT +#define PUBLISHER_QOS_DEFAULT +#define SUBSCRIBER_QOS_DEFAULT +#define DATAWRITER_QOS_DEFAULT +#define DATAREADER_QOS_DEFAULT +#define DATAWRITER_QOS_USE_TOPIC_QOS +#define DATAREADER_QOS_USE_TOPIC_QOS + +#include "tao/StringSeq.pidl" +#include "connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl" + +module DDS { + typedef long DomainId_t; + typedef long long_3[3]; + + struct BuiltinTopicKey_t { + long_3 value; + }; + + typedef long ReturnCode_t; + typedef long QosPolicyId_t; + typedef sequence<string> StringSeq; + + struct Duration_t { + long sec; + unsigned long nanosec; + }; + + struct Time_t { + long sec; + unsigned long nanosec; + }; + + // ---------------------------------------------------------------------- + // Pre-defined values + // ---------------------------------------------------------------------- + //const InstanceHandle_t HANDLE_NIL = 0; + + const long LENGTH_UNLIMITED = -1; + + const long DURATION_INFINITE_SEC = 0x7fffffff; + const unsigned long DURATION_INFINITE_NSEC = 0x7fffffff; + + const long DURATION_ZERO_SEC = 0; + const unsigned long DURATION_ZERO_NSEC = 0; + + const long TIME_INVALID_SEC = -1; + const unsigned long TIME_INVALID_NSEC = 0xffffffff; + + // ---------------------------------------------------------------------- + // Return codes + // ---------------------------------------------------------------------- + const ReturnCode_t RETCODE_OK = 0; + const ReturnCode_t RETCODE_ERROR = 1; + const ReturnCode_t RETCODE_UNSUPPORTED = 2; + const ReturnCode_t RETCODE_BAD_PARAMETER = 3; + const ReturnCode_t RETCODE_PRECONDITION_NOT_MET = 4; + const ReturnCode_t RETCODE_OUT_OF_RESOURCES = 5; + const ReturnCode_t RETCODE_NOT_ENABLED = 6; + const ReturnCode_t RETCODE_IMMUTABLE_POLICY = 7; + const ReturnCode_t RETCODE_INCONSISTENT_POLICY = 8; + const ReturnCode_t RETCODE_ALREADY_DELETED = 9; + const ReturnCode_t RETCODE_TIMEOUT = 10; + const ReturnCode_t RETCODE_NO_DATA = 11; + const ReturnCode_t RETCODE_ILLEGAL_OPERATION = 12; + + // ---------------------------------------------------------------------- + // Status to support listeners and conditions + // ---------------------------------------------------------------------- + + typedef unsigned long StatusKind; + typedef unsigned long StatusMask; // bit-mask StatusKind + + const StatusKind INCONSISTENT_TOPIC_STATUS = 0x0001 << 0; + const StatusKind OFFERED_DEADLINE_MISSED_STATUS = 0x0001 << 1; + const StatusKind REQUESTED_DEADLINE_MISSED_STATUS = 0x0001 << 2; + const StatusKind OFFERED_INCOMPATIBLE_QOS_STATUS = 0x0001 << 5; + const StatusKind REQUESTED_INCOMPATIBLE_QOS_STATUS = 0x0001 << 6; + const StatusKind SAMPLE_LOST_STATUS = 0x0001 << 7; + const StatusKind SAMPLE_REJECTED_STATUS = 0x0001 << 8; + const StatusKind DATA_ON_READERS_STATUS = 0x0001 << 9; + const StatusKind DATA_AVAILABLE_STATUS = 0x0001 << 10; + const StatusKind LIVELINESS_LOST_STATUS = 0x0001 << 11; + const StatusKind LIVELINESS_CHANGED_STATUS = 0x0001 << 12; + const StatusKind PUBLICATION_MATCHED_STATUS = 0x0001 << 13; + const StatusKind SUBSCRIPTION_MATCHED_STATUS = 0x0001 << 14; + const StatusKind RELIABLE_WRITER_CACHE_CHANGED_STATUS = 0x00000001 << 24; + const StatusKind RELIABLE_READER_ACTIVITY_CHANGED_STATUS = 0x00000001 << 25; + + struct InconsistentTopicStatus { + long total_count; + long total_count_change; + }; + + struct SampleLostStatus { + long total_count; + long total_count_change; + }; + + enum SampleRejectedStatusKind { + NOT_REJECTED, + REJECTED_BY_INSTANCES_LIMIT, + REJECTED_BY_SAMPLES_LIMIT, + REJECTED_BY_SAMPLES_PER_INSTANCE_LIMIT + }; + + struct SampleRejectedStatus { + long total_count; + long total_count_change; + SampleRejectedStatusKind last_reason; + InstanceHandle_t last_instance_handle; + }; + + struct LivelinessLostStatus { + long total_count; + long total_count_change; + }; + + struct LivelinessChangedStatus { + long alive_count; + long not_alive_count; + long alive_count_change; + long not_alive_count_change; + InstanceHandle_t last_publication_handle; + }; + + struct OfferedDeadlineMissedStatus { + long total_count; + long total_count_change; + InstanceHandle_t last_instance_handle; + }; + + struct RequestedDeadlineMissedStatus { + long total_count; + long total_count_change; + InstanceHandle_t last_instance_handle; + }; + + struct QosPolicyCount { + QosPolicyId_t policy_id; + long count; + }; + + typedef sequence<QosPolicyCount> QosPolicyCountSeq; + + struct OfferedIncompatibleQosStatus { + long total_count; + long total_count_change; + QosPolicyId_t last_policy_id; + QosPolicyCountSeq policies; + }; + + struct RequestedIncompatibleQosStatus { + long total_count; + long total_count_change; + QosPolicyId_t last_policy_id; + QosPolicyCountSeq policies; + }; + + struct PublicationMatchedStatus { + long total_count; + long total_count_change; + long current_count; + long current_count_change; + InstanceHandle_t last_subscription_handle; + }; + + struct SubscriptionMatchedStatus { + long total_count; + long total_count_change; + long current_count; + long current_count_change; + InstanceHandle_t last_publication_handle; + }; + + struct ReliableReaderActivityChangedStatus { + long active_count; + long inactive_count; + long active_count_change; + long inactive_count_change; + InstanceHandle_t last_instance_handle; + }; + + struct ReliableWriterCacheEventCount { + long total_count; + long total_count_change; + }; + + struct ReliableWriterCacheChangedStatus { + ReliableWriterCacheEventCount empty_reliable_writer_cache; + ReliableWriterCacheEventCount full_reliable_writer_cache; + ReliableWriterCacheEventCount low_watermark_reliable_writer_cache; + ReliableWriterCacheEventCount high_watermark_reliable_writer_cache; + long unacknowledged_sample_count; + long unacknowledged_sample_count_peak; + }; + + // ---------------------------------------------------------------------- + // Listeners + // ---------------------------------------------------------------------- + + local interface Listener; + local interface Entity; + local interface TopicDescription; + local interface Topic; + local interface ContentFilteredTopic; + local interface MultiTopic; + local interface DataWriter; + local interface DataReader; + local interface Subscriber; + local interface Publisher; + + typedef sequence<DataReader> DataReaderSeq; + + local interface Listener {}; + + local interface TopicListener : Listener { + void on_inconsistent_topic(in Topic the_topic, + in InconsistentTopicStatus status); + }; + + local interface DataWriterListener : Listener { + void on_offered_deadline_missed( + in DataWriter writer, + in OfferedDeadlineMissedStatus status); + void on_offered_incompatible_qos( + in DataWriter writer, + in OfferedIncompatibleQosStatus status); + void on_liveliness_lost( + in DataWriter writer, + in LivelinessLostStatus status); + void on_publication_matched( + in DataWriter writer, + in PublicationMatchedStatus status); + void on_reliable_writer_cache_changed ( + in DataWriter writer, + in ReliableWriterCacheChangedStatus status); + void on_reliable_reader_activity_changed ( + in DataWriter writer, + in ReliableReaderActivityChangedStatus status); + }; + + local interface PublisherListener : DataWriterListener { + }; + + local interface DataReaderListener : Listener { + void on_requested_deadline_missed( + in DataReader the_reader, + in RequestedDeadlineMissedStatus status); + void on_requested_incompatible_qos( + in DataReader the_reader, + in RequestedIncompatibleQosStatus status); + void on_sample_rejected( + in DataReader the_reader, + in SampleRejectedStatus status); + void on_liveliness_changed( + in DataReader the_reader, + in LivelinessChangedStatus status); + void on_data_available( + in DataReader the_reader); + void on_subscription_matched( + in DataReader the_reader, + in SubscriptionMatchedStatus status); + void on_sample_lost( + in DataReader the_reader, + in SampleLostStatus status); + }; + + local interface SubscriberListener : DataReaderListener { + void on_data_on_readers( + in Subscriber the_subscriber); + }; + + + local interface DomainParticipantListener : TopicListener, + PublisherListener, + SubscriberListener { + }; + + + // ---------------------------------------------------------------------- + // Conditions + // ---------------------------------------------------------------------- + + local interface Condition { + boolean get_trigger_value(); + }; + + typedef sequence<Condition> ConditionSeq; + + local interface WaitSet { + ReturnCode_t wait( + inout ConditionSeq active_conditions, + in Duration_t timeout); + ReturnCode_t attach_condition( + in Condition cond); + ReturnCode_t detach_condition( + in Condition cond); + ReturnCode_t get_conditions( + inout ConditionSeq attached_conditions); + }; + + local interface GuardCondition : Condition { + ReturnCode_t set_trigger_value( + in boolean value); + }; + + local interface StatusCondition : Condition { + StatusMask get_enabled_statuses(); + ReturnCode_t set_enabled_statuses( + in StatusMask mask); + Entity get_entity(); + }; + + // Sample states to support reads + typedef unsigned long SampleStateKind; + const SampleStateKind READ_SAMPLE_STATE = 0x0001 << 0; + const SampleStateKind NOT_READ_SAMPLE_STATE = 0x0001 << 1; + + // This is a bit-mask SampleStateKind + typedef unsigned long SampleStateMask; + const SampleStateMask ANY_SAMPLE_STATE = 0xffff; + + // View states to support reads + typedef unsigned long ViewStateKind; + const ViewStateKind NEW_VIEW_STATE = 0x0001 << 0; + const ViewStateKind NOT_NEW_VIEW_STATE = 0x0001 << 1; + + // This is a bit-mask ViewStateKind + typedef unsigned long ViewStateMask; + const ViewStateMask ANY_VIEW_STATE = 0xffff; + + // Instance states to support reads + typedef unsigned long InstanceStateKind; + const InstanceStateKind ALIVE_INSTANCE_STATE = 0x0001 << 0; + const InstanceStateKind NOT_ALIVE_DISPOSED_INSTANCE_STATE = 0x0001 << 1; + const InstanceStateKind NOT_ALIVE_NO_WRITERS_INSTANCE_STATE = 0x0001 << 2; + + // This is a bit-mask InstanceStateKind + typedef unsigned long InstanceStateMask; + const InstanceStateMask ANY_INSTANCE_STATE = 0xffff; + const InstanceStateMask NOT_ALIVE_INSTANCE_STATE = 0x006; + + + local interface ReadCondition : Condition { + SampleStateMask get_sample_state_mask(); + ViewStateMask get_view_state_mask(); + InstanceStateMask get_instance_state_mask(); + DataReader get_datareader(); + }; + + local interface QueryCondition : ReadCondition { + string get_query_expression(); + ReturnCode_t get_query_parameters( + inout StringSeq query_parameters); + ReturnCode_t set_query_parameters( + in StringSeq query_parameters); + }; + + // ---------------------------------------------------------------------- + // Qos + // ---------------------------------------------------------------------- + const string USERDATA_QOS_POLICY_NAME = "UserData"; + const string DURABILITY_QOS_POLICY_NAME = "Durability"; + const string PRESENTATION_QOS_POLICY_NAME = "Presentation"; + const string DEADLINE_QOS_POLICY_NAME = "Deadline"; + const string LATENCYBUDGET_QOS_POLICY_NAME = "LatencyBudget"; + const string OWNERSHIP_QOS_POLICY_NAME = "Ownership"; + const string OWNERSHIPSTRENGTH_QOS_POLICY_NAME = "OwnershipStrength"; + const string LIVELINESS_QOS_POLICY_NAME = "Liveliness"; + const string TIMEBASEDFILTER_QOS_POLICY_NAME = "TimeBasedFilter"; + const string PARTITION_QOS_POLICY_NAME = "Partition"; + const string RELIABILITY_QOS_POLICY_NAME = "Reliability"; + const string DESTINATIONORDER_QOS_POLICY_NAME = "DestinationOrder"; + const string HISTORY_QOS_POLICY_NAME = "History"; + const string RESOURCELIMITS_QOS_POLICY_NAME = "ResourceLimits"; + const string ENTITYFACTORY_QOS_POLICY_NAME = "EntityFactory"; + const string WRITERDATALIFECYCLE_QOS_POLICY_NAME = "WriterDataLifecycle"; + const string READERDATALIFECYCLE_QOS_POLICY_NAME = "ReaderDataLifecycle"; + const string TOPICDATA_QOS_POLICY_NAME = "TopicData"; + const string GROUPDATA_QOS_POLICY_NAME = "TransportPriority"; + const string LIFESPAN_QOS_POLICY_NAME = "Lifespan"; + const string DURABILITYSERVICE_POLICY_NAME = "DurabilityService"; + + const QosPolicyId_t INVALID_QOS_POLICY_ID = 0; + const QosPolicyId_t USERDATA_QOS_POLICY_ID = 1; + const QosPolicyId_t DURABILITY_QOS_POLICY_ID = 2; + const QosPolicyId_t PRESENTATION_QOS_POLICY_ID = 3; + const QosPolicyId_t DEADLINE_QOS_POLICY_ID = 4; + const QosPolicyId_t LATENCYBUDGET_QOS_POLICY_ID = 5; + const QosPolicyId_t OWNERSHIP_QOS_POLICY_ID = 6; + const QosPolicyId_t OWNERSHIPSTRENGTH_QOS_POLICY_ID = 7; + const QosPolicyId_t LIVELINESS_QOS_POLICY_ID = 8; + const QosPolicyId_t TIMEBASEDFILTER_QOS_POLICY_ID = 9; + const QosPolicyId_t PARTITION_QOS_POLICY_ID = 10; + const QosPolicyId_t RELIABILITY_QOS_POLICY_ID = 11; + const QosPolicyId_t DESTINATIONORDER_QOS_POLICY_ID = 12; + const QosPolicyId_t HISTORY_QOS_POLICY_ID = 13; + const QosPolicyId_t RESOURCELIMITS_QOS_POLICY_ID = 14; + const QosPolicyId_t ENTITYFACTORY_QOS_POLICY_ID = 15; + const QosPolicyId_t WRITERDATALIFECYCLE_QOS_POLICY_ID = 16; + const QosPolicyId_t READERDATALIFECYCLE_QOS_POLICY_ID = 17; + const QosPolicyId_t TOPICDATA_QOS_POLICY_ID = 18; + const QosPolicyId_t GROUPDATA_QOS_POLICY_ID = 19; + const QosPolicyId_t TRANSPORTPRIORITY_QOS_POLICY_ID = 20; + const QosPolicyId_t LIFESPAN_QOS_POLICY_ID = 21; + const QosPolicyId_t DURABILITYSERVICE_QOS_POLICY_ID = 22; + + typedef sequence<octet> OctetSeq; + struct UserDataQosPolicy { + OctetSeq value; + }; + + struct TopicDataQosPolicy { + OctetSeq value; + }; + + struct GroupDataQosPolicy { + OctetSeq value; + }; + + struct TransportPriorityQosPolicy { + long value; + }; + + struct LifespanQosPolicy { + Duration_t duration; + }; + + enum DurabilityQosPolicyKind { + VOLATILE_DURABILITY_QOS, + TRANSIENT_LOCAL_DURABILITY_QOS, + TRANSIENT_DURABILITY_QOS, + PERSISTENT_DURABILITY_QOS + }; + struct DurabilityQosPolicy { + DurabilityQosPolicyKind kind; + }; + + enum PresentationQosPolicyAccessScopeKind { + INSTANCE_PRESENTATION_QOS, + TOPIC_PRESENTATION_QOS, + GROUP_PRESENTATION_QOS + }; + struct PresentationQosPolicy { + PresentationQosPolicyAccessScopeKind access_scope; + boolean coherent_access; + boolean ordered_access; + }; + + struct DeadlineQosPolicy { + Duration_t period; + }; + + struct LatencyBudgetQosPolicy { + Duration_t duration; + }; + + enum OwnershipQosPolicyKind { + SHARED_OWNERSHIP_QOS, + EXCLUSIVE_OWNERSHIP_QOS + }; + struct OwnershipQosPolicy { + OwnershipQosPolicyKind kind; + }; + + struct OwnershipStrengthQosPolicy { + long value; + }; + + enum LivelinessQosPolicyKind { + AUTOMATIC_LIVELINESS_QOS, + MANUAL_BY_PARTICIPANT_LIVELINESS_QOS, + MANUAL_BY_TOPIC_LIVELINESS_QOS + }; + + struct LivelinessQosPolicy { + LivelinessQosPolicyKind kind; + Duration_t lease_duration; + }; + + struct TimeBasedFilterQosPolicy { + Duration_t minimum_separation; + }; + + struct PartitionQosPolicy { + StringSeq name; + }; + + enum ReliabilityQosPolicyKind { + BEST_EFFORT_RELIABILITY_QOS, + RELIABLE_RELIABILITY_QOS + }; + + struct ReliabilityQosPolicy { + ReliabilityQosPolicyKind kind; + Duration_t max_blocking_time; + }; + + enum DestinationOrderQosPolicyKind { + BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS, + BY_SOURCE_TIMESTAMP_DESTINATIONORDER_QOS + }; + struct DestinationOrderQosPolicy { + DestinationOrderQosPolicyKind kind; + }; + + enum HistoryQosPolicyKind { + KEEP_LAST_HISTORY_QOS, + KEEP_ALL_HISTORY_QOS + }; + struct HistoryQosPolicy { + HistoryQosPolicyKind kind; + long depth; + }; + + struct ResourceLimitsQosPolicy { + long max_samples; + long max_instances; + long max_samples_per_instance; + }; + + struct EntityFactoryQosPolicy { + boolean autoenable_created_entities; + }; + + struct WriterDataLifecycleQosPolicy { + boolean autodispose_unregistered_instances; + }; + + struct ReaderDataLifecycleQosPolicy { + Duration_t autopurge_nowriter_samples_delay; + Duration_t autopurge_disposed_samples_delay; + }; + + struct DurabilityServiceQosPolicy { + Duration_t service_cleanup_delay; + HistoryQosPolicyKind history_kind; + long history_depth; + long max_samples; + long max_instances; + long max_samples_per_instance; + }; + + struct DomainParticipantFactoryQos { + EntityFactoryQosPolicy entity_factory; + }; + + struct DomainParticipantQos { + UserDataQosPolicy user_data; + EntityFactoryQosPolicy entity_factory; + }; + + struct TopicQos { + TopicDataQosPolicy topic_data; + DurabilityQosPolicy durability; + DurabilityServiceQosPolicy durability_service; + DeadlineQosPolicy deadline; + LatencyBudgetQosPolicy latency_budget; + LivelinessQosPolicy liveliness; + ReliabilityQosPolicy reliability; + DestinationOrderQosPolicy destination_order; + HistoryQosPolicy history; + ResourceLimitsQosPolicy resource_limits; + TransportPriorityQosPolicy transport_priority; + LifespanQosPolicy lifespan; + + OwnershipQosPolicy ownership; + }; + + struct DataWriterQos { + DurabilityQosPolicy durability; + DurabilityServiceQosPolicy durability_service; + DeadlineQosPolicy deadline; + LatencyBudgetQosPolicy latency_budget; + LivelinessQosPolicy liveliness; + ReliabilityQosPolicy reliability; + DestinationOrderQosPolicy destination_order; + HistoryQosPolicy history; + ResourceLimitsQosPolicy resource_limits; + TransportPriorityQosPolicy transport_priority; + LifespanQosPolicy lifespan; + + UserDataQosPolicy user_data; + OwnershipQosPolicy ownership; + OwnershipStrengthQosPolicy ownership_strength; + WriterDataLifecycleQosPolicy writer_data_lifecycle; + }; + + struct PublisherQos { + PresentationQosPolicy presentation; + PartitionQosPolicy partition; + GroupDataQosPolicy group_data; + EntityFactoryQosPolicy entity_factory; + }; + + struct DataReaderQos { + DurabilityQosPolicy durability; + DeadlineQosPolicy deadline; + LatencyBudgetQosPolicy latency_budget; + LivelinessQosPolicy liveliness; + ReliabilityQosPolicy reliability; + DestinationOrderQosPolicy destination_order; + HistoryQosPolicy history; + ResourceLimitsQosPolicy resource_limits; + + UserDataQosPolicy user_data; + OwnershipQosPolicy ownership; + TimeBasedFilterQosPolicy time_based_filter; + ReaderDataLifecycleQosPolicy reader_data_lifecycle; + }; + + struct SubscriberQos { + PresentationQosPolicy presentation; + PartitionQosPolicy partition; + GroupDataQosPolicy group_data; + EntityFactoryQosPolicy entity_factory; + }; + + // ---------------------------------------------------------------------- + + struct ParticipantBuiltinTopicData { + BuiltinTopicKey_t key; + UserDataQosPolicy user_data; + }; + + struct TopicBuiltinTopicData { + BuiltinTopicKey_t key; + string name; + string type_name; + DurabilityQosPolicy durability; + DurabilityServiceQosPolicy durability_service; + DeadlineQosPolicy deadline; + LatencyBudgetQosPolicy latency_budget; + LivelinessQosPolicy liveliness; + ReliabilityQosPolicy reliability; + TransportPriorityQosPolicy transport_priority; + LifespanQosPolicy lifespan; + DestinationOrderQosPolicy destination_order; + HistoryQosPolicy history; + ResourceLimitsQosPolicy resource_limits; + OwnershipQosPolicy ownership; + TopicDataQosPolicy topic_data; + }; + + struct PublicationBuiltinTopicData { + BuiltinTopicKey_t key; + BuiltinTopicKey_t participant_key; + string topic_name; + string type_name; + + DurabilityQosPolicy durability; + DurabilityServiceQosPolicy durability_service; + DeadlineQosPolicy deadline; + LatencyBudgetQosPolicy latency_budget; + LivelinessQosPolicy liveliness; + ReliabilityQosPolicy reliability; + LifespanQosPolicy lifespan; + UserDataQosPolicy user_data; + OwnershipQosPolicy ownership; + OwnershipStrengthQosPolicy ownership_strength; + DestinationOrderQosPolicy destination_order; + + PresentationQosPolicy presentation; + PartitionQosPolicy partition; + TopicDataQosPolicy topic_data; + GroupDataQosPolicy group_data; + }; + + struct SubscriptionBuiltinTopicData { + BuiltinTopicKey_t key; + BuiltinTopicKey_t participant_key; + string topic_name; + string type_name; + + DurabilityQosPolicy durability; + DeadlineQosPolicy deadline; + LatencyBudgetQosPolicy latency_budget; + LivelinessQosPolicy liveliness; + ReliabilityQosPolicy reliability; + OwnershipQosPolicy ownership; + DestinationOrderQosPolicy destination_order; + UserDataQosPolicy user_data; + TimeBasedFilterQosPolicy time_based_filter; + + PresentationQosPolicy presentation; + PartitionQosPolicy partition; + TopicDataQosPolicy topic_data; + GroupDataQosPolicy group_data; + }; + + // ---------------------------------------------------------------------- + local interface Entity { + // ReturnCode_t set_qos( + // in EntityQos qos); + // ReturnCode_t get_qos( + // inout EntityQos qos); + // ReturnCode_t set_listener( + // in Listener l, + // in StatusMask mask); + // Listener get_listener(); + + ReturnCode_t enable(); + + StatusCondition get_statuscondition(); + + StatusMask get_status_changes(); + + InstanceHandle_t get_instance_handle(); + }; + + // ---------------------------------------------------------------------- + local interface DomainParticipant : Entity { + // Factory interfaces + Publisher create_publisher( + in PublisherQos qos, + in PublisherListener a_listener, + in StatusMask mask); + Publisher create_publisher_with_profile( + in string qos_profile, + in PublisherListener a_listener, + in StatusMask mask); + ReturnCode_t delete_publisher( + in Publisher p); + + Subscriber create_subscriber( + in SubscriberQos qos, + in SubscriberListener a_listener, + in StatusMask mask); + Subscriber create_subscriber_with_profile( + in string qos_profile, + in SubscriberListener a_listener, + in StatusMask mask); + ReturnCode_t delete_subscriber( + in Subscriber s); + Subscriber get_builtin_subscriber(); + + Topic create_topic( + in string topic_name, + in string type_name, + in TopicQos qos, + in TopicListener a_listener, + in StatusMask mask); + Topic create_topic_with_profile( + in string topic_name, + in string type_name, + in string qos_profile, + in TopicListener a_listener, + in StatusMask mask); + + ReturnCode_t delete_topic( + in Topic a_topic); + + Topic find_topic( + in string topic_name, + in Duration_t timeout); + TopicDescription lookup_topicdescription( + in string name); + + ContentFilteredTopic create_contentfilteredtopic( + in string name, + in Topic related_topic, + in string filter_expression, + in StringSeq expression_parameters); + + ReturnCode_t delete_contentfilteredtopic( + in ContentFilteredTopic a_contentfilteredtopic); + + MultiTopic create_multitopic( + in string name, + in string type_name, + in string subscription_expression, + in StringSeq expression_parameters); + + ReturnCode_t delete_multitopic( + in MultiTopic a_multitopic); + + ReturnCode_t delete_contained_entities(); + + ReturnCode_t set_qos( + in DomainParticipantQos qos); + ReturnCode_t get_qos( + inout DomainParticipantQos qos); + + ReturnCode_t set_listener( + in DomainParticipantListener a_listener, + in StatusMask mask); + DomainParticipantListener get_listener(); + + ReturnCode_t ignore_participant( + in InstanceHandle_t handle); + ReturnCode_t ignore_topic( + in InstanceHandle_t handle); + ReturnCode_t ignore_publication( + in InstanceHandle_t handle); + ReturnCode_t ignore_subscription( + in InstanceHandle_t handle); + + DomainId_t get_domain_id(); + ReturnCode_t assert_liveliness(); + + ReturnCode_t set_default_publisher_qos( + in PublisherQos qos); + ReturnCode_t get_default_publisher_qos( + inout PublisherQos qos); + + ReturnCode_t set_default_subscriber_qos( + in SubscriberQos qos); + ReturnCode_t get_default_subscriber_qos( + inout SubscriberQos qos); + + ReturnCode_t set_default_topic_qos( + in TopicQos qos); + ReturnCode_t get_default_topic_qos( + inout TopicQos qos); + + ReturnCode_t get_discovered_participants( + inout InstanceHandleSeq participant_handles); + ReturnCode_t get_discovered_participant_data( + inout ParticipantBuiltinTopicData participant_data, + in InstanceHandle_t participant_handle); + + ReturnCode_t get_discovered_topics( + inout InstanceHandleSeq topic_handles); + ReturnCode_t get_discovered_topic_data( + inout TopicBuiltinTopicData topic_data, + in InstanceHandle_t topic_handle); + + boolean contains_entity( + in InstanceHandle_t a_handle); + + ReturnCode_t get_current_time( + inout Time_t current_time); + }; + + local interface DomainParticipantFactory { + DomainParticipant create_participant( + in DomainId_t domain_id, + in DomainParticipantQos qos, + in DomainParticipantListener a_listener, + in StatusMask mask); + DomainParticipant create_participant_with_profile( + in DomainId_t domain_id, + in string qos_profile, + in DomainParticipantListener a_listener, + in StatusMask mask); + ReturnCode_t delete_participant( + in DomainParticipant a_participant); + + DomainParticipant lookup_participant( + in DomainId_t domain_id); + + ReturnCode_t set_default_participant_qos( + in DomainParticipantQos qos); + ReturnCode_t set_default_participant_qos_with_profile( + in string qos_profile); + ReturnCode_t get_default_participant_qos( + inout DomainParticipantQos qos); + + ReturnCode_t set_qos( + in DomainParticipantFactoryQos qos); + ReturnCode_t get_qos( + inout DomainParticipantFactoryQos qos); + }; + + local interface TypeSupport { + ReturnCode_t register_type( + in DomainParticipant domain, + in string type_name); + string get_type_name(); + }; + + // ---------------------------------------------------------------------- + local interface TopicDescription { + string get_type_name(); + string get_name(); + + DomainParticipant get_participant(); + }; + + local interface Topic : Entity, TopicDescription { + ReturnCode_t set_qos( + in TopicQos qos); + ReturnCode_t get_qos( + inout TopicQos qos); + ReturnCode_t set_listener( + in TopicListener a_listener, + in StatusMask mask); + TopicListener get_listener(); + // Access the status + ReturnCode_t get_inconsistent_topic_status( + inout InconsistentTopicStatus a_status); + }; + + local interface ContentFilteredTopic : TopicDescription { + string get_filter_expression(); + ReturnCode_t get_expression_parameters( + inout StringSeq expression_parameters); + ReturnCode_t set_expression_parameters( + in StringSeq expression_parameters); + Topic get_related_topic(); + }; + + local interface MultiTopic : TopicDescription { + string get_subscription_expression(); + ReturnCode_t get_expression_parameters( + inout StringSeq expression_parameters); + ReturnCode_t set_expression_parameters( + in StringSeq expression_parameters); + }; + + // ---------------------------------------------------------------------- + local interface Publisher : Entity { + DataWriter create_datawriter( + in Topic a_topic, + in DataWriterQos qos, + in DataWriterListener a_listener, + in StatusMask mask); + DataWriter create_datawriter_with_profile( + in Topic a_topic, + in string qos_profile, + in DataWriterListener a_listener, + in StatusMask mask); + ReturnCode_t delete_datawriter( + in DataWriter a_datawriter); + DataWriter lookup_datawriter( + in string topic_name); + + ReturnCode_t delete_contained_entities(); + + ReturnCode_t set_qos( + in PublisherQos qos); + ReturnCode_t get_qos( + inout PublisherQos qos); + + ReturnCode_t set_listener( + in PublisherListener a_listener, + in StatusMask mask); + PublisherListener get_listener(); + + ReturnCode_t suspend_publications(); + ReturnCode_t resume_publications(); + + ReturnCode_t begin_coherent_changes(); + ReturnCode_t end_coherent_changes(); + + ReturnCode_t wait_for_acknowledgments( + in Duration_t max_wait); + + DomainParticipant get_participant(); + + ReturnCode_t set_default_datawriter_qos( + in DataWriterQos qos); + ReturnCode_t get_default_datawriter_qos( + inout DataWriterQos qos); + + ReturnCode_t copy_from_topic_qos( + inout DataWriterQos a_datawriter_qos, + in TopicQos a_topic_qos); + }; + + local interface DataWriter : Entity { + ReturnCode_t set_qos( + in DataWriterQos qos); + ReturnCode_t get_qos( + inout DataWriterQos qos); + + ReturnCode_t set_listener( + in DataWriterListener a_listener, + in StatusMask mask); + DataWriterListener get_listener(); + + Topic get_topic(); + Publisher get_publisher(); + + ReturnCode_t wait_for_acknowledgments( + in Duration_t max_wait); + + // Access the status + ReturnCode_t get_liveliness_lost_status( + inout LivelinessLostStatus status); + ReturnCode_t get_offered_deadline_missed_status( + inout OfferedDeadlineMissedStatus status); + ReturnCode_t get_offered_incompatible_qos_status( + inout OfferedIncompatibleQosStatus status); + ReturnCode_t get_publication_matched_status( + inout PublicationMatchedStatus status); + + ReturnCode_t assert_liveliness(); + + ReturnCode_t get_matched_subscriptions( + inout InstanceHandleSeq subscription_handles); + ReturnCode_t get_matched_subscription_data( + inout SubscriptionBuiltinTopicData subscription_data, + in InstanceHandle_t subscription_handle); + }; + + // ---------------------------------------------------------------------- + local interface Subscriber : Entity { + DataReader create_datareader( + in TopicDescription a_topic, + in DataReaderQos qos, + in DataReaderListener a_listener, + in StatusMask mask); + DataReader create_datareader_with_profile( + in TopicDescription a_topic, + in string qos_profile, + in DataReaderListener a_listener, + in StatusMask mask); + ReturnCode_t delete_datareader( + in DataReader a_datareader); + ReturnCode_t delete_contained_entities(); + DataReader lookup_datareader( + in string topic_name); + ReturnCode_t get_datareaders( + inout DataReaderSeq readers, + in SampleStateMask sample_states, + in ViewStateMask view_states, + in InstanceStateMask instance_states); + ReturnCode_t notify_datareaders(); + + ReturnCode_t set_qos( + in SubscriberQos qos); + ReturnCode_t get_qos( + inout SubscriberQos qos); + + ReturnCode_t set_listener( + in SubscriberListener a_listener, + in StatusMask mask); + SubscriberListener get_listener(); + + ReturnCode_t begin_access(); + ReturnCode_t end_access(); + + DomainParticipant get_participant(); + + ReturnCode_t set_default_datareader_qos( + in DataReaderQos qos); + ReturnCode_t get_default_datareader_qos( + inout DataReaderQos qos); + + ReturnCode_t copy_from_topic_qos( + inout DataReaderQos a_datareader_qos, + in TopicQos a_topic_qos); + }; + + local interface DataReader : Entity { + ReadCondition create_readcondition( + in SampleStateMask sample_states, + in ViewStateMask view_states, + in InstanceStateMask instance_states); + + QueryCondition create_querycondition( + in SampleStateMask sample_states, + in ViewStateMask view_states, + in InstanceStateMask instance_states, + in string query_expression, + in StringSeq query_parameters); + + ReturnCode_t delete_readcondition( + in ReadCondition a_condition); + + ReturnCode_t delete_contained_entities(); + + ReturnCode_t set_qos( + in DataReaderQos qos); + ReturnCode_t get_qos( + inout DataReaderQos qos); + + ReturnCode_t set_listener( + in DataReaderListener a_listener, + in StatusMask mask); + DataReaderListener get_listener(); + + TopicDescription get_topicdescription(); + Subscriber get_subscriber(); + + ReturnCode_t get_sample_rejected_status( + inout SampleRejectedStatus status); + ReturnCode_t get_liveliness_changed_status( + inout LivelinessChangedStatus status); + ReturnCode_t get_requested_deadline_missed_status( + inout RequestedDeadlineMissedStatus status); + ReturnCode_t get_requested_incompatible_qos_status( + inout RequestedIncompatibleQosStatus status); + ReturnCode_t get_subscription_matched_status( + inout SubscriptionMatchedStatus status); + ReturnCode_t get_sample_lost_status( + inout SampleLostStatus status); + + ReturnCode_t wait_for_historical_data( + in Duration_t max_wait); + + ReturnCode_t get_matched_publications( + inout InstanceHandleSeq publication_handles); + ReturnCode_t get_matched_publication_data( + inout PublicationBuiltinTopicData publication_data, + in InstanceHandle_t publication_handle); + }; + + struct SampleInfo { + SampleStateKind sample_state; + ViewStateKind view_state; + InstanceStateKind instance_state; + Time_t source_timestamp; + InstanceHandle_t instance_handle; + InstanceHandle_t publication_handle; + long disposed_generation_count; + long no_writers_generation_count; + long sample_rank; + long generation_rank; + long absolute_generation_rank; + boolean valid_data; + }; + + typedef sequence<SampleInfo> SampleInfoSeq; +}; + +#endif diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_i_handle.idl index c351df2b6f4..f1fe41405e9 100644 --- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_i_handle.idl @@ -1,11 +1,10 @@ // $Id$ -#ifndef DDS_RFT2_DCPS_IDL_I -#define DDS_RFT2_DCPS_IDL_I +#ifndef NDDS_DCPS_IDL_I +#define NDDS_DCPS_IDL_I -#pragma ciao lem "connectors/dds4ccm/idl/dds_rtf2_dcps_i_handleE.idl" +#pragma ciao lem "connectors/dds4ccm/idl/ndds/ndds_dcps_i_handleE.idl" -#if (CIAO_DDS4CCM_NDDS==1) module DDS { typedef octet octet_value[16]; struct NativeInstanceHandle_t { @@ -17,7 +16,6 @@ module DDS { typedef sequence<InstanceHandle_t> InstanceHandleSeq; }; -#endif #endif diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl new file mode 100644 index 00000000000..84e66db8c48 --- /dev/null +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl @@ -0,0 +1,12 @@ +// $Id$ + +#ifndef NDDS_DCPS_INSTANCE_HANDLE_IDL +#define NDDS_DCPS_INSTANCE_HANDLE_IDL + +#include "connectors/dds4ccm/idl/ndds/ndds_dcps_i_handle.idl" + +module DDS { + native HANDLE_NIL; +}; + +#endif diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.cpp b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp index 3fe4af04da8..bb603914e2d 100644 --- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.cpp +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp @@ -1,9 +1,7 @@ // -*- C++ -*- // $Id$ -#include "dds_rtf2_dcps_instance_handleC.h" - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +#include "ndds_dcps_instance_handleC.h" static ::DDS::InstanceHandle_t S_HANDLE = { {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 16, 0}; @@ -12,4 +10,3 @@ namespace DDS ::DDS::InstanceHandle_t const HANDLE_NIL = S_HANDLE; } -#endif diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.h b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h index 9d8723910b7..44c07445031 100644 --- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.h +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h @@ -13,23 +13,16 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include /**/ "dds4ccm_stub_export.h" +#include /**/ "ndds_stub_export.h" #include /**/ "tao/Versioned_Namespace.h" -#include "dds_rtf2_dcps_i_handleC.h" - -// TAO_IDL - Generated from -// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_root/root_ch.cpp:62 - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +#include "ndds_dcps_i_handleC.h" namespace DDS { - extern DDS4CCM_STUB_Export ::DDS::InstanceHandle_t const HANDLE_NIL; + extern NDDS_STUB_Export ::DDS::InstanceHandle_t const HANDLE_NIL; } -#endif - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleEC.h b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleEC.h index aa63d70414b..211279cdb2c 100644 --- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleEC.h +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleEC.h @@ -42,7 +42,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include /**/ "dds4ccm_lem_stub_export.h" +#include /**/ "ndds_lem_stub_export.h" #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ORB.h" #include "tao/SystemException.h" @@ -56,7 +56,7 @@ #include /**/ "tao/Versioned_Namespace.h" #include "ccm/CCM_ContainerC.h" -#include "dds_rtf2_dcps_instance_handleC.h" +#include "ndds_dcps_instance_handleC.h" #include /**/ "ace/post.h" diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleS.h b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleS.h index cfde5fcb45e..5ebb4386a0f 100644 --- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleS.h +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleS.h @@ -34,14 +34,14 @@ #include /**/ "ace/pre.h" -#include "dds_rtf2_dcps_i_handleC.h" +#include "ndds_dcps_i_handleC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include /**/ "dds4ccm_skel_export.h" +#include /**/ "ndds_skel_export.h" #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_lem_stub.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_lem_stub.mpc new file mode 100644 index 00000000000..7a71cf628c2 --- /dev/null +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_lem_stub.mpc @@ -0,0 +1,41 @@ +// $Id$ + +project (CIAO_NDDS_lem_gen) : install, ciaoidldefaults { + custom_only = 1 + after += CIAO_NDDS_idl_gen + idlflags += -I$(CIAO_ROOT)/connectors \ + -Wb,stub_export_macro=NDDS_LEM_STUB_Export \ + -Wb,stub_export_include=ndds_lem_stub_export.h -SS + + IDL_Files { + idlflags += -Gxhst + ndds_dcpsE.idl + } + + IDL_Files { + ndds_dcps_i_handleE.idl + } +} + +project (CIAO_NDDS_lem_stub) : install, ccm_lem_stub, ccm_session_stub, ciaolib_with_idl, ciao_output, taolib, valuetype, ifr_client { + after += CIAO_NDDS_stub CIAO_NDDS_lem_gen + libs += CIAO_NDDS_stub + includes += $(CIAO_ROOT)/connectors + sharedname = CIAO_NDDS_lem_stub + dynamicflags += NDDS_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + ndds_dcpsEC.cpp + ndds_dcps_i_handleEC.cpp + } + + Header_Files { + ndds_dcpsEC.h + ndds_lem_stub_export.h + ndds_dcps_i_handleEC.h + } +} + diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_skel.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_skel.mpc new file mode 100644 index 00000000000..4908324e745 --- /dev/null +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_skel.mpc @@ -0,0 +1,20 @@ +// -*- MPC -*- +// $Id$ + +project (CIAO_NDDS_skel) : install, ndds_lem_stub, ciaolib_with_idl, ciao_output, taolib, portableserver, ciao_servant { + includes += $(CIAO_ROOT)/connectors + + dynamicflags += NDDS_SKEL_BUILD_DLL + IDL_Files { + } + + Header_Files { + ndds_dcpsS.h + ndds_dcps_i_handleS.h + } + + Source_Files { + ndds_dcpsS.cpp + ndds_dcps_i_handleS.cpp + } +} diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_stub.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_stub.mpc new file mode 100644 index 00000000000..3a704b80d54 --- /dev/null +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_stub.mpc @@ -0,0 +1,40 @@ +// $Id$ + +project (CIAO_NDDS_idl_gen) : install, ndds, componentidldefaults { + custom_only = 1 + idlflags += -Wb,stub_export_macro=NDDS_STUB_Export \ + -Wb,stub_export_include=ndds_stub_export.h \ + -Wb,skel_export_macro=NDDS_SKEL_Export \ + -Wb,skel_export_include=ndds_skel_export.h \ + -I$(CIAO_ROOT)/connectors -Glem + + IDL_Files { + ndds_dcps.idl + } + IDL_Files { + idlflags -= -Gxhst -Gxhsk + ndds_dcps_i_handle.idl + } +} + +project (CIAO_NDDS_stub) : install, ndds, ccm_stub, ciaolib_with_idl, ciao_output, taolib { + + after += CIAO_NDDS_idl_gen + includes += $(CIAO_ROOT)/connectors + + dynamicflags += NDDS_STUB_BUILD_DLL + IDL_Files { + } + + Header_Files { + ndds_dcpsC.h + ndds_dcps_i_handleC.h + ndds_dcps_instance_handleC.h + } + + Source_Files { + ndds_dcpsC.cpp + ndds_dcps_i_handleC.cpp + ndds_dcps_instance_handleC.cpp + } +} diff --git a/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp b/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp index 6b53ae9f862..b39e267d230 100644 --- a/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp +++ b/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp @@ -1,6 +1,7 @@ // $Id$ #include "dds4ccm/impl/ConditionManager.h" + #include "dds4ccm/impl/Utils.h" #include "ace/OS_NS_sys_time.h" @@ -56,8 +57,17 @@ namespace CIAO ConditionManager::check_handle (const ::DDS::InstanceHandle_t & instance_handle, const ::DDS::InstanceHandle_t & lookup_handle) { - return this->ws_.check_handle (instance_handle, - lookup_handle); + bool error = false; + bool non_existent = false; + ::DDS::InstanceHandle_t ret = this->ws_.check_handle (instance_handle, + lookup_handle, + error, + non_existent); + if (error) + throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + if (non_existent) + throw ::CCM_DDS::NonExistent (); + return ret; } bool diff --git a/CIAO/connectors/dds4ccm/impl/ConditionManager.h b/CIAO/connectors/dds4ccm/impl/ConditionManager.h index 035667a6fc5..1065107152e 100644 --- a/CIAO/connectors/dds4ccm/impl/ConditionManager.h +++ b/CIAO/connectors/dds4ccm/impl/ConditionManager.h @@ -3,7 +3,10 @@ #ifndef CONDITIONMANAGER_H_ #define CONDITIONMANAGER_H_ +#if (CIAO_DDS4CCM_NDDS==1) #include "dds4ccm/impl/ndds/WaitSet.h" +#endif + #include <dds4ccm/idl/dds4ccm_BaseC.h> #include "dds4ccm/impl/dds4ccm_dds_impl_export.h" diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp index 20a4bbf0bb0..10bae4190eb 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp @@ -1,7 +1,6 @@ // -*- C++ -*- // $Id$ -#include "ace/Tokenizer_T.h" #include "ace/Env_Value_T.h" #include "tao/ORB_Core.h" #include "dds4ccm/impl/Utils.h" @@ -20,8 +19,6 @@ template <typename CCM_TYPE> DDS_Base_Connector_T<CCM_TYPE>::DDS_Base_Connector_T (void) : domain_id_ (0) , configuration_complete_ (false) - , library_name_ (0) - , profile_name_ (0) { DDS4CCM_TRACE ("DDS_Base_Connector_T<CCM_TYPE>::DDS_Base_Connector_T"); @@ -40,9 +37,6 @@ DDS_Base_Connector_T<CCM_TYPE>::~DDS_Base_Connector_T (void) { DDS4CCM_TRACE ("DDS_Base_Connector_T<CCM_TYPE>::~DDS_Base_Connector_T"); - ACE_OS::free (library_name_); - ACE_OS::free (profile_name_); - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO "DDS_Base_Connector_T::~DDS_Base_Connector_T - " "Connector has been destructed\n")); @@ -96,22 +90,7 @@ DDS_Base_Connector_T<CCM_TYPE>::qos_profile ( } else { - this->qos_profile_ = qos_profile; - char* buf = ACE_OS::strdup (qos_profile); - ACE_Tokenizer_T<char> tok (buf); - tok.delimiter_replace ('#', 0); - for (char *p = tok.next (); p; p = tok.next ()) - { - if (!this->library_name_) - { - this->library_name_ = ACE_OS::strdup (p); - } - else if (!this->profile_name_) - { - this->profile_name_ = ACE_OS::strdup (p); - } - } - ACE_OS::free (buf); + this->qos_profile_ = ::CORBA::string_dup (qos_profile); } } @@ -127,17 +106,14 @@ DDS_Base_Connector_T<CCM_TYPE>::init_domain ( "Start configuring default domain <%d>\n", this->domain_id_)); - // Generic parsing code, library and profile should be separated by a # - if (this->library_name_ && this->profile_name_) + if (!::CORBA::is_nil (this->qos_profile_.in ())) { this->participant_factory_.set_default_participant_qos_with_profile ( - this->library_name_, - this->profile_name_); + this->qos_profile_.in ()); participant = this->participant_factory_.create_participant_with_profile ( this->domain_id_, - this->library_name_, - this->profile_name_, + this->qos_profile_.in (), ::DDS::DomainParticipantListener::_nil (), 0); } @@ -237,18 +213,6 @@ DDS_Base_Connector_T<CCM_TYPE>::reactor (void) } /** - * Type registration - **/ -template <typename CCM_TYPE> -void -DDS_Base_Connector_T<CCM_TYPE>::register_type ( - ::DDS::DomainParticipant_ptr /*participant*/, - const char * /*typesupport_name*/) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::register_type"); -} - -/** * Initialization **/ template <typename CCM_TYPE> @@ -262,12 +226,11 @@ DDS_Base_Connector_T<CCM_TYPE>::init_topic ( DDS4CCM_TRACE ("DDS_Base_Connector_T::init_topic"); ::DDS::Topic_var tp; - if (this->library_name_ && this->profile_name_) + if (!::CORBA::is_nil (this->qos_profile_.in ())) { tp = participant->create_topic_with_profile (topic_name, typesupport_name, - this->library_name_, - this->profile_name_, + this->qos_profile_.in (), ::DDS::TopicListener::_nil (), 0); } @@ -300,11 +263,10 @@ DDS_Base_Connector_T<CCM_TYPE>::init_publisher ( if (::CORBA::is_nil (publisher)) { - if (this->library_name_ && this->profile_name_) + if (!::CORBA::is_nil (this->qos_profile_.in ())) { publisher = participant->create_publisher_with_profile ( - this->library_name_, - this->profile_name_, + this->qos_profile_.in (), ::DDS::PublisherListener::_nil (), 0); } @@ -335,11 +297,10 @@ DDS_Base_Connector_T<CCM_TYPE>::init_subscriber ( if (::CORBA::is_nil (subscriber)) { - if (this->library_name_ && this->profile_name_) + if (!::CORBA::is_nil (this->qos_profile_.in ())) { subscriber = participant->create_subscriber_with_profile ( - this->library_name_, - this->profile_name_, + this->qos_profile_.in (), ::DDS::SubscriberListener::_nil (), 0); } @@ -609,15 +570,3 @@ DDS_Base_Connector_T<CCM_TYPE>::remove_domain ( throw ::CCM_DDS::InternalError (retcode, 0); } } - -/** - * Unregister type - **/ -template <typename CCM_TYPE> -void -DDS_Base_Connector_T<CCM_TYPE>::unregister_type ( - ::DDS::DomainParticipant_ptr /*participant*/, - const char * /*typesupport_name*/) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::unregister_type"); -} diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h index 2fa0bc695c3..db75691be8a 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h @@ -62,9 +62,9 @@ protected: /** * Initialization of a connector. * - * When one wants to use his own ::DDS::DomainParticipant, ::DDS::Topic, - * ::DDS::Subscriber and/or ::DDS::Publisher, these helper methods allows - * to create these, independant of the DDS vendor. + * When one wants to use his own DDS::DomainParticipant, DDS::Topic, + * DDS::Subscriber and/or DDS::Publisher, these helper methods allows + * to create these, independent of the DDS vendor. * * See * $CIAO_ROOT/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp @@ -78,7 +78,8 @@ protected: void init_domain (::DDS::DomainParticipant_ptr & participant); virtual void register_type (::DDS::DomainParticipant_ptr participant, - const char * typesupport_name); + const char * typesupport_name) = 0; + void init_topic (::DDS::DomainParticipant_ptr participant, ::DDS::Topic_ptr & topic, const char * topic_name, @@ -93,7 +94,7 @@ protected: * Activation of a connector. * * Helper methods to create the DDS listeners and attach them to the DDS Entities. - * This'll will activate the DDS Entities. + * This will activate the DDS Entities. * */ //@{ @@ -161,7 +162,7 @@ protected: virtual void unregister_type (::DDS::DomainParticipant_ptr participant, - const char * typesupport_name); + const char * typesupport_name) = 0; //@} /// Get the reactor associated with this component @@ -183,14 +184,6 @@ protected: */ bool configuration_complete_; - /** - * Result of splitting qos_profile into to different names. - */ - //@{ - char* library_name_; - char* profile_name_; - //@} - ::CIAO::DDS4CCM::Logger_Service * dlf_; ::DDS::DomainParticipant_var domain_participant_; diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp index 1d30520942b..673079c1f32 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp @@ -10,8 +10,8 @@ #include "dds4ccm/impl/logger/Log_Macros.h" #include "dds4ccm/impl/dds4ccm_conf.h" -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::DDS_Event_Connector_T (void) : +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::DDS_Event_Connector_T (void) : TopicBaseConnector (), supplier_obtained_ (false), push_consumer_obtained_ (false), @@ -22,165 +22,165 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::DDS_ { } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::~DDS_Event_Connector_T (void) +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::~DDS_Event_Connector_T (void) { } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::supplier_traits::data_type::_ptr_type -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_data (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_data (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_data"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_data"); this->supplier_obtained_ = true; this->supplier_.set_component (this); return this->supplier_.get_data (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::supplier_traits::dds_entity_type::_ptr_type -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_dds_entity (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_dds_entity (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_dds_entity"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_dds_entity"); this->supplier_obtained_ = true; this->supplier_.set_component (this); return this->supplier_.get_dds_entity (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_consumer_traits::fresh_data_type::_ptr_type -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_fresh_data (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_fresh_data (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_fresh_data"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_fresh_data"); this->pull_consumer_obtained_ = true; this->pull_consumer_.set_component (this); return this->pull_consumer_.get_fresh_data (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_consumer_traits::data_type::_ptr_type -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_data (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_data (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_data"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_data"); this->push_consumer_obtained_ = true; this->push_consumer_.set_component (this); return this->push_consumer_.get_data (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_consumer_traits::data_type::_ptr_type -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_data (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_data (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_data"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_data"); this->pull_consumer_obtained_ = true; this->pull_consumer_.set_component (this); return this->pull_consumer_.get_data (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::CCM_ContentFilterSetting_ptr -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_filter_config (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_filter_config (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_filter_config"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_filter_config"); this->pull_consumer_obtained_ = true; this->pull_consumer_.set_component (this); return this->pull_consumer_.get_filter_config (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::CCM_DataListenerControl_ptr -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_data_control (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_data_control (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_data_control"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_data_control"); this->push_consumer_obtained_ = true; this->push_consumer_.set_component (this); return this->push_consumer_.get_data_control (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::DDS::CCM_DataReader_ptr -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_dds_entity (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_dds_entity (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_dds_entity"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_dds_entity"); this->pull_consumer_obtained_ = true; this->pull_consumer_.set_component (this); return this->pull_consumer_.get_dds_entity (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter* -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_consumer_filter (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_filter (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_consumer_filter"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_filter"); return this->pull_consumer_.filter (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_consumer_filter ( +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_filter ( const ::CCM_DDS::QueryFilter & filter) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_consumer_filter"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_filter"); this->pull_consumer_.filter (filter); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::DDS::CCM_DataReader_ptr -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_dds_entity (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_dds_entity (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_dds_entity"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_dds_entity"); this->push_consumer_obtained_ = true; this->push_consumer_.set_component (this); return this->push_consumer_.get_dds_entity (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::CCM_ContentFilterSetting_ptr -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_filter_config (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_filter_config (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_filter_config"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_filter_config"); this->push_consumer_obtained_ = true; this->push_consumer_.set_component (this); return this->push_consumer_.get_filter_config (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter* -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_consumer_filter (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_filter (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_consumer_filter"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_filter"); return this->push_consumer_.filter (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_consumer_filter ( +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_filter ( const ::CCM_DDS::QueryFilter & filter) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_consumer_filter"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_filter"); this->push_consumer_.filter (filter); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topic_name ( +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name ( const char * topic_name) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topic_name"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name"); if (this->late_binded (topic_name)) { @@ -189,11 +189,11 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topi } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_configuration_complete (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_configuration_complete (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_configuration_complete"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_configuration_complete"); TopicBaseConnector::configuration_complete (); @@ -214,19 +214,18 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_c if (this->push_consumer_obtained_) { DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>" + "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>" "::configuration_complete - " "Creating push consumer port.\n")); this->push_consumer_.configuration_complete ( this->topic_.in (), this->subscriber_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_.in ()); } else { DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>" + "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>" "::configuration_complete - " "No need to create push consumer port.\n")); } @@ -234,19 +233,18 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_c if (this->supplier_obtained_) { DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>" + "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>" "::configuration_complete - " "Creating supplier port.\n")); this->supplier_.configuration_complete( this->topic_.in (), this->publisher_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_.in ()); } else { DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>" + "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>" "::configuration_complete - " "No need to create supplier port.\n")); } @@ -254,29 +252,28 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_c if (this->pull_consumer_obtained_) { DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>" + "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>" "::configuration_complete - " "Creating pull consumer port.\n")); this->pull_consumer_.configuration_complete ( this->topic_.in (), this->subscriber_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_.in ()); } else { DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>" + "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>" "::configuration_complete - " "No need to create pull consumer port.\n")); } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::configuration_complete (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::configuration_complete (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::configuration_complete"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::configuration_complete"); try { @@ -310,9 +307,9 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::conf } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_ccm_activate (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_ccm_activate (void) { ACE_Reactor* reactor = 0; @@ -359,11 +356,11 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_c } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_activate (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_activate (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_activate"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_activate"); try { @@ -397,11 +394,11 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_ } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_passivate (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_passivate (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_passivate"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_passivate"); try { @@ -449,11 +446,11 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_ } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_remove (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_remove"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove"); try { diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.h index dddf11fd3c4..5989692264a 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.h @@ -13,7 +13,7 @@ #include "dds4ccm/impl/DDS_Write_T.h" #include "dds4ccm/impl/DDS_Listen_T.h" -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> class DDS_Event_Connector_T : public virtual DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE> { diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp index a96a9469136..30fe30dd841 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp @@ -26,14 +26,12 @@ void DDS_Get_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, FIXED>::configuration_complete ( ::DDS::Topic_ptr topic, ::DDS::Subscriber_ptr subscriber, - const char* library_name, - const char* profile_name) + const char * qos_profile) { DDS4CCM_TRACE ("DDS_Get_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, FIXED>::configuration_complete"); SubscriberBase_type::configuration_complete (topic, subscriber, - library_name, - profile_name); + qos_profile); ::DDS::DataReader_var dr = this->dds_read_->get_dds_reader (); this->dds_get_->set_dds_reader (dr.in (), diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h index 9791a850077..7b670374730 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h @@ -33,8 +33,7 @@ public: void configuration_complete ( ::DDS::Topic_ptr topic, ::DDS::Subscriber_ptr subscriber, - const char* library_name, - const char* profile_name); + const char * qos_profile); void remove ( ::DDS::Subscriber_ptr subscriber); diff --git a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp index d456b29729f..439edbab8e7 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp @@ -10,8 +10,8 @@ #include "dds4ccm/impl/logger/Log_Macros.h" #include "dds4ccm/impl/dds4ccm_conf.h" -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::DDS_State_Connector_T (void) : +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::DDS_State_Connector_T (void) : TopicBaseConnector (), observable_obtained_ (false), passive_observer_obtained_ (false), @@ -21,280 +21,280 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::DDS_ { } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::~DDS_State_Connector_T (void) +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::~DDS_State_Connector_T (void) { } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::observable_traits::data_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_observable_data (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_observable_data (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_observable_data"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_observable_data"); this->observable_obtained_ = true; this->observable_.set_component (this); return this->observable_.get_data (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::observable_traits::dds_entity_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_observable_dds_entity (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_observable_dds_entity (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_observable_dds_entity"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_observable_dds_entity"); this->observable_obtained_ = true; this->observable_.set_component (this); return this->observable_.get_dds_entity (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::passive_observer_traits::data_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_passive_observer_data (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_passive_observer_data (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_passive_observer_data"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_passive_observer_data"); this->passive_observer_obtained_ = true; this->passive_observer_.set_component (this); return this->passive_observer_.get_data (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::passive_observer_traits::dds_entity_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_passive_observer_dds_entity (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_passive_observer_dds_entity (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_passive_observer_dds_entity"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_passive_observer_dds_entity"); this->passive_observer_obtained_ = true; this->passive_observer_.set_component (this); return this->passive_observer_.get_dds_entity (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::passive_observer_traits::filter_config_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_passive_observer_filter_config (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_passive_observer_filter_config (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_passive_observer_filter_config"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_passive_observer_filter_config"); this->passive_observer_obtained_ = true; this->passive_observer_.set_component (this); return this->passive_observer_.get_filter_config (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter* -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::passive_observer_filter (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::passive_observer_filter (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::passive_observer_filter"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::passive_observer_filter"); return this->passive_observer_.filter (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::passive_observer_filter ( +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::passive_observer_filter ( const ::CCM_DDS::QueryFilter & filter) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::passive_observer_filter"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::passive_observer_filter"); this->passive_observer_.filter (filter); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_observer_traits::data_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_observer_data (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_data (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_observer_data"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_data"); this->pull_observer_obtained_ = true; this->pull_observer_.set_component (this); return this->pull_observer_.get_data (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_observer_traits::fresh_data_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_observer_fresh_data (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_fresh_data (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_observer_fresh_data"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_fresh_data"); this->pull_observer_obtained_ = true; this->pull_observer_.set_component (this); return this->pull_observer_.get_fresh_data (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_observer_traits::dds_entity_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_observer_dds_entity (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_dds_entity (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_observer_dds_entity"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_dds_entity"); this->pull_observer_obtained_ = true; this->pull_observer_.set_component (this); return this->pull_observer_.get_dds_entity (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_observer_traits::filter_config_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_observer_filter_config (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_filter_config (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_observer_filter_config"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_filter_config"); this->pull_observer_obtained_ = true; this->pull_observer_.set_component (this); return this->pull_observer_.get_filter_config (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter* -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_observer_filter (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_observer_filter (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_observer_filter"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_observer_filter"); return this->pull_observer_.filter (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_observer_filter ( +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_observer_filter ( const ::CCM_DDS::QueryFilter & filter) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_observer_filter"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_observer_filter"); this->pull_observer_.filter (filter); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_observer_traits::data_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_observer_data (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_data (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_observer_data"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_data"); this->push_observer_obtained_ = true; this->push_observer_.set_component (this); return this->push_observer_.get_data (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_observer_traits::data_control_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_observer_data_control (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_data_control (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_observer_data_control"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_data_control"); this->push_observer_obtained_ = true; this->push_observer_.set_component (this); return this->push_observer_.get_data_control (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_observer_traits::dds_entity_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_observer_dds_entity (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_dds_entity (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_observer_dds_entity"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_dds_entity"); this->push_observer_obtained_ = true; this->push_observer_.set_component (this); return this->push_observer_.get_dds_entity (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_observer_traits::filter_config_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_observer_filter_config (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_filter_config (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_observer_filter_config"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_filter_config"); this->push_observer_obtained_ = true; this->push_observer_.set_component (this); return this->push_observer_.get_filter_config (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter* -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_observer_filter (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_observer_filter (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_observer_filter"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_observer_filter"); return this->push_observer_.filter (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_observer_filter ( +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_observer_filter ( const ::CCM_DDS::QueryFilter & filter) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_observer_filter"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_observer_filter"); this->push_observer_.filter (filter); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_state_observer_traits::data_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_state_observer_data (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_data (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_state_observer_data"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_data"); this->push_state_observer_obtained_ = true; this->push_state_observer_.set_component (this); return this->push_state_observer_.get_data (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_state_observer_traits::data_control_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_state_observer_data_control (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_data_control (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_state_observer_data_control"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_data_control"); this->push_state_observer_obtained_ = true; this->push_state_observer_.set_component (this); return this->push_state_observer_.get_data_control (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_state_observer_traits::dds_entity_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_state_observer_dds_entity (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_dds_entity (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_state_observer_dds_entity"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_dds_entity"); this->push_state_observer_obtained_ = true; this->push_state_observer_.set_component (this); return this->push_state_observer_.get_dds_entity (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_state_observer_traits::filter_config_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_state_observer_filter_config (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_filter_config (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_state_observer_filter_config"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_filter_config"); this->push_state_observer_obtained_ = true; this->push_state_observer_.set_component (this); return this->push_state_observer_.get_filter_config (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter* -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_state_observer_filter (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_state_observer_filter (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_state_observer_filter"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_state_observer_filter"); return this->push_state_observer_.filter (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_state_observer_filter ( +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_state_observer_filter ( const ::CCM_DDS::QueryFilter & filter) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_state_observer_filter"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_state_observer_filter"); this->push_state_observer_.filter (filter); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topic_name ( +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name ( const char * topic_name) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topic_name"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name"); if (this->late_binded (topic_name)) { @@ -303,11 +303,11 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topi } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_configuration_complete (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_configuration_complete (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_configuration_complete"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_configuration_complete"); TopicBaseConnector::configuration_complete (); @@ -338,8 +338,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_c this->observable_.configuration_complete ( this->topic_.in (), this->publisher_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_.in ()); } if (this->push_observer_obtained_) @@ -347,8 +346,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_c this->push_observer_.configuration_complete ( this->topic_.in (), this->subscriber_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_.in ()); } if (this->push_state_observer_obtained_) @@ -356,8 +354,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_c this->push_state_observer_.configuration_complete ( this->topic_.in (), this->subscriber_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_.in ()); } if (this->pull_observer_obtained_) @@ -365,8 +362,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_c this->pull_observer_.configuration_complete ( this->topic_.in (), this->subscriber_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_.in ()); } if (this->passive_observer_obtained_) @@ -374,16 +370,15 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_c this->passive_observer_.configuration_complete ( this->topic_.in (), this->subscriber_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_.in ()); } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::configuration_complete (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::configuration_complete (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::configuration_complete"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::configuration_complete"); try { @@ -417,11 +412,11 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::conf } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_ccm_activate (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_ccm_activate (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_ccm_activate"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_ccm_activate"); ACE_Reactor* reactor = 0; @@ -492,11 +487,11 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_c } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_activate (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_activate (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_activate"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_activate"); try { @@ -530,11 +525,11 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_ } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_passivate (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_passivate (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_passivate"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_passivate"); try { @@ -593,11 +588,11 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_ } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_remove (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_remove"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove"); try { diff --git a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.h index 3e290319ff9..c06f49dda14 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.h @@ -15,7 +15,7 @@ #include "dds4ccm/impl/DDS_Update_T.h" #include "dds4ccm/impl/DDS_Read_T.h" -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> class DDS_State_Connector_T : public virtual DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE> { diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp index ba0572a1ff0..47a6470f9b0 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp @@ -27,8 +27,7 @@ void DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_complete ( ::DDS::Topic_ptr topic, ::DDS::Subscriber_ptr subscriber, - const char* library_name, - const char* profile_name) + const char * qos_profile) { DDS4CCM_TRACE ("DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_complete"); @@ -57,12 +56,11 @@ DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::c { td = ::DDS::TopicDescription::_narrow (topic); } - if (library_name && profile_name) + if (qos_profile) { dr = subscriber->create_datareader_with_profile ( td.in (), - library_name, - profile_name, + qos_profile, ::DDS::DataReaderListener::_nil (), 0); } diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h index 70b9e6ca777..9fb256516e5 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h @@ -45,8 +45,7 @@ public: void configuration_complete ( ::DDS::Topic_ptr topic, ::DDS::Subscriber_ptr subscriber, - const char* library_name, - const char* profile_name); + const char* qos_profile); void activate ( ::CCM_DDS::PortStatusListener_ptr listener, diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp index fe6f2b9d04c..ca3931628b5 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp @@ -27,20 +27,18 @@ void DDS_Update_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_complete ( ::DDS::Topic_ptr topic, ::DDS::Publisher_ptr publisher, - const char* library_name, - const char* profile_name) + const char * qos_profile) { DDS4CCM_TRACE ("DDS_Update_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_complete"); ::DDS::DataWriter_var dw = this->dds_update_->get_dds_writer (); if (::CORBA::is_nil (dw.in ())) { ::DDS::DataWriter_var dwv_tmp; - if (library_name && profile_name) + if (qos_profile) { dwv_tmp = publisher->create_datawriter_with_profile ( topic, - library_name, - profile_name, + qos_profile, ::DDS::DataWriterListener::_nil (), 0); } diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h index 96f86ddbc0e..88d1372249b 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h @@ -27,8 +27,7 @@ public: void configuration_complete ( ::DDS::Topic_ptr topic, ::DDS::Publisher_ptr publisher, - const char* library_name, - const char* profile_name); + const char * qos_profile); void activate (void); diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp index 02ef3a39081..1c2dcf0c777 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp @@ -28,24 +28,22 @@ void DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_complete ( ::DDS::Topic_ptr topic, ::DDS::Publisher_ptr publisher, - const char* library_name, - const char* profile_name) + const char * qos_profile) { DDS4CCM_TRACE ("DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_complete"); ::DDS::DataWriter_var dw = this->dds_write_->get_dds_writer (); if (::CORBA::is_nil (dw.in ())) { ::DDS::DataWriter_var dwv_tmp; - if (library_name && profile_name) + if (qos_profile) { dwv_tmp = publisher->create_datawriter_with_profile ( topic, - library_name, - profile_name, + qos_profile, ::DDS::DataWriterListener::_nil (), 0); } - else + else { ::DDS::DataWriterQos dwqos; dwv_tmp = publisher->create_datawriter ( @@ -53,7 +51,7 @@ DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_c dwqos, ::DDS::DataWriterListener::_nil (), 0); - } + } if (::CORBA::is_nil (dwv_tmp.in ())) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h index ff2bd8f526d..a71dbe0b029 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h @@ -34,8 +34,7 @@ public: void configuration_complete ( ::DDS::Topic_ptr topic, ::DDS::Publisher_ptr publisher, - const char* library_name, - const char* profile_name); + const char* qos_profile); void activate (void); diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp index 98e22b28932..74c539ca6f1 100644 --- a/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp @@ -1,6 +1,5 @@ // $Id$ -#include "dds4ccm/impl/Utils.h" #include "dds4ccm/impl/logger/Log_Macros.h" template <typename CCM_TYPE, typename TYPED_READER, typename SEQ_TYPE> diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp index 4fa4a119785..3181abfe5fd 100644 --- a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp @@ -1,4 +1,5 @@ // $Id$ + #include "dds4ccm/impl/Utils.h" #include "dds4ccm/impl/logger/Log_Macros.h" diff --git a/CIAO/connectors/dds4ccm/impl/Getter_T.cpp b/CIAO/connectors/dds4ccm/impl/Getter_T.cpp index a126f156368..205a1eaa3cb 100644 --- a/CIAO/connectors/dds4ccm/impl/Getter_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/Getter_T.cpp @@ -110,7 +110,7 @@ namespace CIAO max_samples, rd); } - return DDS_RETCODE_ERROR; + return ::DDS::RETCODE_ERROR; } template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE> diff --git a/CIAO/connectors/dds4ccm/impl/Getter_T.h b/CIAO/connectors/dds4ccm/impl/Getter_T.h index 42a77bf13c2..e9760d1325e 100644 --- a/CIAO/connectors/dds4ccm/impl/Getter_T.h +++ b/CIAO/connectors/dds4ccm/impl/Getter_T.h @@ -12,9 +12,11 @@ #include "dds4ccm/idl/dds_rtf2_dcpsC.h" #include "ace/Copy_Disabled.h" -#include "dds4ccm/impl/ndds/Condition.h" -#include "dds4ccm/impl/ndds/ReadCondition.h" -#include "dds4ccm/impl/ndds/QueryCondition.h" +#if (CIAO_DDS4CCM_NDDS==1) +# include "dds4ccm/impl/ndds/Condition.h" +# include "dds4ccm/impl/ndds/ReadCondition.h" +# include "dds4ccm/impl/ndds/QueryCondition.h" +#endif namespace CIAO { diff --git a/CIAO/connectors/dds4ccm/impl/Reader_T.cpp b/CIAO/connectors/dds4ccm/impl/Reader_T.cpp index 56c42efb126..fde38551ac2 100644 --- a/CIAO/connectors/dds4ccm/impl/Reader_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/Reader_T.cpp @@ -3,6 +3,7 @@ #include "dds4ccm/impl/Utils.h" #include "dds4ccm/impl/logger/Log_Macros.h" +#include "dds4ccm/impl/SampleInfo.h" namespace CIAO { diff --git a/CIAO/connectors/dds4ccm/impl/TopicListener.cpp b/CIAO/connectors/dds4ccm/impl/TopicListener.cpp index 52ec7966366..143ab0282a2 100644 --- a/CIAO/connectors/dds4ccm/impl/TopicListener.cpp +++ b/CIAO/connectors/dds4ccm/impl/TopicListener.cpp @@ -2,7 +2,6 @@ #include "dds4ccm/impl/TopicListener.h" #include "dds4ccm/impl/Utils.h" -#include "dds4ccm/impl/ndds/Topic.h" #include "dds4ccm/impl/DDSCallbackStatusHandler.h" #include "dds4ccm/impl/logger/Log_Macros.h" #include "ace/Reactor.h" diff --git a/CIAO/connectors/dds4ccm/impl/Utils.h b/CIAO/connectors/dds4ccm/impl/Utils.h index 7f6633016b0..d19e4af4f11 100644 --- a/CIAO/connectors/dds4ccm/impl/Utils.h +++ b/CIAO/connectors/dds4ccm/impl/Utils.h @@ -4,14 +4,18 @@ * * $Id$ * - * Misc utility classes for NDDS. + * Misc utility classes for DDS4CCM. */ -#ifndef NDDS_UTILS_H -#define NDDS_UTILS_H +#ifndef DDS4CCM_UTILS_H +#define DDS4CCM_UTILS_H + +#if (CIAO_DDS4CCM_NDDS==1) +# include "dds4ccm/idl/ndds/ndds_dcpsC.h" +#else +# include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#endif -#include "dds4ccm_dds_impl_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" #include "dds4ccm/impl/dds4ccm_conf.h" #include "ace/String_Base.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc b/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc index cff418e4654..5cf662893ae 100644 --- a/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc +++ b/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc @@ -1,7 +1,7 @@ // $Id$ project(CIAO_DDS4CCM_DDS_Impl) : install, dds4ccm_skel, dds4ccm_lem_stub, taolib, \ - ciao_output, ccm_stub, dds4ccm_logger, ndds_impl { + ciao_output, ccm_stub, dds4ccm_logger { dynamicflags += DDS4CCM_DDS_IMPL_BUILD_DLL macros += BUILDING_DDS_LIB diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp index efa38681ab5..d8fcb35c29e 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp @@ -1,8 +1,8 @@ // $Id$ +#include "Condition.h" + #include "ndds/ndds_cpp.h" -#include "dds4ccm/idl/dds4ccm_BaseC.h" -#include "dds4ccm/impl/ndds/Condition.h" #include "dds4ccm/impl/logger/Log_Macros.h" namespace CIAO diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Condition.h b/CIAO/connectors/dds4ccm/impl/ndds/Condition.h index 4c980fb7954..270dfdb85e9 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Condition.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Condition.h @@ -9,10 +9,10 @@ #ifndef CONDITION_H_ #define CONDITION_H_ -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "ndds_dcpsC.h" #include "tao/LocalObject.h" -#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" +#include "dds4ccm_ndds_export.h" class DDSCondition; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h index b2406c2fb0b..834a7565db1 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h @@ -10,7 +10,7 @@ #define CONTENFILTEREDTOPIC_T_H_ #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "tao/LocalObject.h" class DDSContentFilteredTopic; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h index 80ab05eadec..51567f51fa7 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h @@ -9,7 +9,7 @@ #ifndef DATAREADER_H #define DATAREADER_H -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" #include "tao/LocalObject.h" diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h index ca2d6bed622..d5fa3597f96 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h @@ -10,7 +10,7 @@ #define DDSDATAREADERLISTENER_T_H_ #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "ndds/ndds_cpp.h" namespace CIAO diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp index 7b2e1942975..bf379feb0fc 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp @@ -8,6 +8,7 @@ #include "dds4ccm/impl/ndds/TopicDescription.h" #include "dds4ccm/impl/ndds/Topic.h" #include "dds4ccm/impl/ndds/ContentFilteredTopic.h" +#include "dds4ccm/impl/Utils.h" #include "dds4ccm/impl/ndds/convertors/SampleInfoSeq.h" #include "dds4ccm/impl/ndds/convertors/SampleLostStatus.h" @@ -22,7 +23,6 @@ #include "dds4ccm/impl/ndds/convertors/InstanceHandleSeq.h" #include "dds4ccm/impl/ndds/convertors/DataReaderQos.h" #include "dds4ccm/impl/ndds/convertors/StringSeq.h" -#include "dds4ccm/impl/SampleInfo.h" #include "dds4ccm/impl/logger/Log_Macros.h" diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.h index de7964578bb..c91a0c02bfd 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.h @@ -10,9 +10,7 @@ #ifndef DATAREADER_T_H_ #define DATAREADER_T_H_ -#include "dds4ccm/impl/Utils.h" #include "dds4ccm/impl/ndds/DataReader.h" -#include "dds4ccm/idl/dds4ccm_BaseC.h" #include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h" namespace CIAO diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h index 5c702f00d84..efd1ce3da71 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h @@ -9,7 +9,7 @@ #ifndef DDS4CCM_DATAWRITER_H #define DDS4CCM_DATAWRITER_H -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h index 021fb75bbc7..af34e108e6b 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h @@ -11,7 +11,7 @@ #define DDSDATAWRITERLISTENER_T_H_ #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "ndds/ndds_cpp.h" namespace CIAO diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.h index 9f781b87123..578a56a77cd 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.h @@ -9,7 +9,7 @@ #ifndef DATAWRITER_T_H_ #define DATAWRITER_T_H_ -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "dds4ccm/impl/dds4ccm_conf.h" #include "dds4ccm/impl/ndds/DataWriter.h" diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp index dfd34028a7d..a94a2a6a3c9 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp @@ -11,9 +11,9 @@ #include "dds4ccm/impl/ndds/SubscriberListener.h" #include "dds4ccm/impl/ndds/StatusCondition.h" -#include "dds4ccm/impl/Utils.h" #include "dds4ccm/impl/ndds/TopicListener.h" #include "dds4ccm/impl/ndds/DomainParticipantManager.h" +#include "dds4ccm/impl/ndds/Utils.h" #include "dds4ccm/impl/ndds/convertors/PublisherQos.h" #include "dds4ccm/impl/ndds/convertors/SubscriberQos.h" @@ -49,16 +49,16 @@ namespace CIAO ::DDS::Publisher_ptr DDS_DomainParticipant_i::create_publisher_with_profile ( - const char* library_name, - const char *profile_name, + const char * qos_profile, ::DDS::PublisherListener_ptr a_listener, ::DDS::StatusMask mask) { DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_publisher_with_profile"); DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_publisher_with_profile - " - "Start creating Publisher\n")); + "DDS_DomainParticipant_i::create_publisher_with_profile <%C> - " + "Start creating Publisher\n", + qos_profile)); DDS_PublisherListener_i *ccm_dds_pl = 0; if (! ::CORBA::is_nil (a_listener)) { @@ -66,17 +66,24 @@ namespace CIAO DDS_PublisherListener_i (a_listener, this), ::CORBA::NO_MEMORY ()); } + char * lib_name = get_library_name(qos_profile); + char * prof_name = get_profile_name(qos_profile); + DDSPublisher * ccm_dds_pub = - this->rti_entity ()->create_publisher_with_profile (library_name, - profile_name, + this->rti_entity ()->create_publisher_with_profile ( + lib_name, + prof_name, ccm_dds_pl, mask); + ACE_OS::free (lib_name); + ACE_OS::free (prof_name); if (!ccm_dds_pub) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_publisher_with_profile - " - "Error: Unable to create Publisher\n")); + "DDS_DomainParticipant_i::create_publisher_with_profile <%C> - " + "Error: Unable to create Publisher\n", + qos_profile)); delete ccm_dds_pl; return ::DDS::Publisher::_nil (); } @@ -87,8 +94,9 @@ namespace CIAO ::CORBA::NO_MEMORY ()); DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_publisher_with_profile - " - "Successfully created a DDSPublisher\n")); + "DDS_DomainParticipant_i::create_publisher_with_profile <%C> - " + "Successfully created a DDSPublisher\n", + qos_profile)); ccm_dds_pub->enable (); return retval._retn (); @@ -191,8 +199,7 @@ namespace CIAO ::DDS::Subscriber_ptr DDS_DomainParticipant_i::create_subscriber_with_profile ( - const char* library_name, - const char *profile_name, + const char * qos_profile, ::DDS::SubscriberListener_ptr a_listener, ::DDS::StatusMask mask) { @@ -200,8 +207,9 @@ namespace CIAO DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO "DDS_DomainParticipant_i" - "::create_subscriber_with_profile - " - "Creating Subscriber\n")); + "::create_subscriber_with_profile <%C> - " + "Creating Subscriber\n", + qos_profile)); DDS_SubscriberListener_i *ccm_dds_sl = 0; if (! ::CORBA::is_nil (a_listener)) @@ -210,19 +218,26 @@ namespace CIAO DDS_SubscriberListener_i (a_listener, this), ::CORBA::NO_MEMORY ()); } + char * lib_name = get_library_name(qos_profile); + char * prof_name = get_profile_name(qos_profile); + DDSSubscriber * ccm_dds_sub = this->rti_entity ()->create_subscriber_with_profile ( - library_name, - profile_name, + lib_name, + prof_name, ccm_dds_sl, mask); + ACE_OS::free (lib_name); + ACE_OS::free (prof_name); + if (!ccm_dds_sub) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO "DDS_DomainParticipant_i::" - "create_subscriber_with_profile - " - "Error: RTI DDS returned a nil subscriber.\n")); + "create_subscriber_with_profile <%C> - " + "Error: RTI DDS returned a nil subscriber.\n", + qos_profile)); delete ccm_dds_sl; return ::DDS::Subscriber::_nil (); } @@ -233,8 +248,9 @@ namespace CIAO ::CORBA::NO_MEMORY ()); DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_subscriber_with_profile - " - "Successfully created a DDSSubscriber\n")); + "DDS_DomainParticipant_i::create_subscriber_with_profile <%C> - " + "Successfully created a DDSSubscriber\n", + qos_profile)); ccm_dds_sub->enable (); return retval._retn (); @@ -273,7 +289,7 @@ namespace CIAO { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO "DDS_DomainParticipant_i::" - "create_subscriber_with_profile - " + "create_subscriber - " "Error: RTI DDS returned a nil subscriber.\n")); delete ccm_dds_sl; return ::DDS::Subscriber::_nil (); @@ -441,8 +457,7 @@ namespace CIAO DDS_DomainParticipant_i::create_topic_with_profile ( const char *impl_name, const char *type_name, - const char *library_name, - const char *profile_name, + const char *qos_profile, ::DDS::TopicListener_ptr a_listener, ::DDS::StatusMask mask) { @@ -451,22 +466,25 @@ namespace CIAO if (impl_name == 0) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_topic_with_profile - " - "Error: provided nil topic name\n")); + "DDS_DomainParticipant_i::create_topic_with_profile <%C> - " + "Error: provided nil topic name\n", + qos_profile)); return ::DDS::Topic::_nil (); } if (type_name == 0) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_topic_with_profile - " - "Error: provided nil type name\n")); + "DDS_DomainParticipant_i::create_topic_with_profile <%C> - " + "Error: provided nil type name\n", + qos_profile)); return ::DDS::Topic::_nil (); } DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_DEBUG, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_topic_with_profile - " + "DDS_DomainParticipant_i::create_topic_with_profile <%C> - " "Attempting to create topic with name %C and type %C\n", + qos_profile, impl_name, type_name)); DDS_TopicListener_i *ccm_dds_tl = 0; @@ -488,19 +506,25 @@ namespace CIAO if (!dds_tp) { + char * lib_name = get_library_name(qos_profile); + char * prof_name = get_profile_name(qos_profile); + dds_tp = this->rti_entity ()->create_topic_with_profile ( impl_name, type_name, - library_name, - profile_name, + lib_name, + prof_name, ccm_dds_tl, mask); + ACE_OS::free (lib_name); + ACE_OS::free (prof_name); if (!dds_tp) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_topic_with_profile - " - "Error: RTI DDS returned a nil topic\n")); + "DDS_DomainParticipant_i::create_topic_with_profile <%C> - " + "Error: RTI DDS returned a nil topic\n", + qos_profile)); delete ccm_dds_tl; return ::DDS::Topic::_nil (); } @@ -511,8 +535,9 @@ namespace CIAO ::CORBA::NO_MEMORY ()); DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_topic_with_profile - " + "DDS_DomainParticipant_i::create_topic_with_profile <%C> - " "Successfully created topic with name %C and type %C\n", + qos_profile, impl_name, type_name)); if (ccm_dds_tl) @@ -526,8 +551,9 @@ namespace CIAO else { DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_topic_with_profile - " + "DDS_DomainParticipant_i::create_topic_with_profile <%C> - " "Re-using topic with name %C and type %C.\n", + qos_profile, impl_name, type_name)); DPMANAGER->_inc_ref (this->rti_entity (), dds_tp); diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h index cbc56b8eee5..f97c54c6708 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h @@ -10,7 +10,7 @@ #ifndef DOMAINPARTICIPANT_T_H_ #define DOMAINPARTICIPANT_T_H_ -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "dds4ccm/impl/dds4ccm_conf.h" #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" #include "tao/LocalObject.h" @@ -38,8 +38,7 @@ namespace CIAO ::DDS::StatusMask mask); virtual ::DDS::Publisher_ptr create_publisher_with_profile ( - const char* library_name, - const char *profile_name, + const char* qos_profile, ::DDS::PublisherListener_ptr a_listener, ::DDS::StatusMask mask); @@ -51,8 +50,7 @@ namespace CIAO ::DDS::StatusMask mask); virtual ::DDS::Subscriber_ptr create_subscriber_with_profile( - const char* library_name, - const char *profile_name, + const char* qos_profile, ::DDS::SubscriberListener_ptr a_listener, ::DDS::StatusMask mask); @@ -70,8 +68,7 @@ namespace CIAO virtual ::DDS::Topic_ptr create_topic_with_profile ( const char * impl_name, const char * type_name, - const char* library_name, - const char *profile_name, + const char* qos_profile, ::DDS::TopicListener_ptr a_listener, ::DDS::StatusMask mask); diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp index fb4b71108b2..be290a1e74b 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp @@ -5,6 +5,7 @@ #include "dds4ccm/impl/ndds/DomainParticipantListener.h" #include "dds4ccm/impl/ndds/convertors/DomainParticipantFactoryQos.h" #include "dds4ccm/impl/ndds/convertors/DomainParticipantQos.h" +#include "dds4ccm/impl/ndds/Utils.h" #include "dds4ccm/impl/Utils.h" #include "dds4ccm/impl/logger/Log_Macros.h" #include "dds4ccm/impl/ndds/DomainParticipantManager.h" @@ -103,8 +104,7 @@ namespace CIAO ::DDS::DomainParticipant_ptr DDS_DomainParticipantFactory_i::create_participant_with_profile ( ::DDS::DomainId_t domain_id, - const char * library_name, - const char * profile_name, + const char * qos_profile, ::DDS::DomainParticipantListener_ptr a_listener, ::DDS::StatusMask mask) { @@ -114,8 +114,8 @@ namespace CIAO DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO "DDS_DomainParticipantFactory_i::create_participant_with_profile - " "Start creating domain participant: " - "profile <%C#%C> - domain <%d>\n", - library_name, profile_name, domain_id)); + "profile <%C> - domain <%d>\n", + qos_profile, domain_id)); DDS_DomainParticipantListener_i *ccm_dds_dpl = 0; if (! ::CORBA::is_nil (a_listener)) { @@ -124,32 +124,35 @@ namespace CIAO ::CORBA::NO_MEMORY ()); } - ACE_CString qos_profile = library_name; - qos_profile += "#"; - qos_profile += profile_name; - - DDSDomainParticipant *dds_dp = - DPMANAGER->get_participant (qos_profile.c_str ()); + DPMANAGER->get_participant (qos_profile); if (!dds_dp) { DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO "DDS_DomainParticipantFactory_i::create_participant_with_profile - " "Creating participant: profile <%C> - domain <%d>\n", - qos_profile.c_str (), + qos_profile, domain_id)); + + char * lib_name = get_library_name(qos_profile); + char * prof_name = get_profile_name(qos_profile); + dds_dp = DDSDomainParticipantFactory::get_instance ()-> create_participant_with_profile (domain_id, - library_name, - profile_name, + lib_name, + prof_name, ccm_dds_dpl, mask); + ACE_OS::free (lib_name); + ACE_OS::free (prof_name); + if (!dds_dp) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipantFactory_i::create_participant_with_profile - " - "Error: Unable to create DomainParticipant\n")); + "DDS_DomainParticipantFactory_i::create_participant_with_profile <%C> - " + "Error: Unable to create DomainParticipant\n", + qos_profile)); return ::DDS::DomainParticipant::_nil (); } ::DDS::DomainParticipant_var retval; @@ -168,7 +171,7 @@ namespace CIAO (retval.in ()); typed_dp->set_rti_entity (dds_dp); - DPMANAGER->add_participant (qos_profile.c_str (), dds_dp); + DPMANAGER->add_participant (qos_profile, dds_dp); return retval._retn (); } else @@ -176,7 +179,7 @@ namespace CIAO DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO "DDS_DomainParticipantFactory_i::create_participant_with_profile - Re-using " "participant for QOS profile <%C> and domain <%d>.\n", - qos_profile.c_str (), + qos_profile, domain_id)); ::DDS::DomainParticipant_var retval; ACE_NEW_THROW_EX (retval, @@ -310,14 +313,18 @@ namespace CIAO ::DDS::ReturnCode_t DDS_DomainParticipantFactory_i::set_default_participant_qos_with_profile ( - const char * library_name, - const char * profile_name) + const char * qos_profile) { - DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::" - "set_default_participant_qos_with_profile"); + char * lib_name = get_library_name(qos_profile); + char * prof_name = get_profile_name(qos_profile); - return DDSDomainParticipantFactory::get_instance ()-> - set_default_participant_qos_with_profile (library_name, profile_name); + ::DDS::ReturnCode_t retcode = DDSDomainParticipantFactory::get_instance ()-> + set_default_participant_qos_with_profile (lib_name, prof_name); + + ACE_OS::free (lib_name); + ACE_OS::free (prof_name); + + return retcode; } } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h index 3ad1bda43ed..a32bbaa6ec5 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h @@ -10,7 +10,7 @@ #ifndef DOMAINPARTICIPANTFACTORY_T_H_ #define DOMAINPARTICIPANTFACTORY_T_H_ -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "tao/LocalObject.h" #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" @@ -40,8 +40,7 @@ namespace CIAO virtual ::DDS::DomainParticipant_ptr create_participant_with_profile ( ::DDS::DomainId_t domain_id, - const char * library_name, - const char * profile_name, + const char * qos_profile, ::DDS::DomainParticipantListener_ptr a_listener, ::DDS::StatusMask mask); @@ -64,8 +63,7 @@ namespace CIAO ::DDS::ReturnCode_t get_qos (::DDS::DomainParticipantFactoryQos & qos); virtual ::DDS::ReturnCode_t set_default_participant_qos_with_profile( - const char * library_name, - const char * profile_name); + const char * qos_profile); }; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h index e51eb310ba0..ddc9db974de 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h @@ -10,7 +10,7 @@ #ifndef DOMAINPARTICIPANTLISTENER_H_ #define DOMAINPARTICIPANTLISTENER_H_ -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" # include "ndds/ndds_cpp.h" diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp index 70f5923d83c..f26eea820a5 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp @@ -1,7 +1,5 @@ // $Id$ -#include "dds4ccm/impl/Utils.h" - #include "dds4ccm/impl/ndds/Publisher.h" #include "dds4ccm/impl/ndds/PublisherListener.h" #include "dds4ccm/impl/ndds/DomainParticipant.h" @@ -10,6 +8,7 @@ #include "dds4ccm/impl/ndds/StatusCondition.h" #include "dds4ccm/impl/ndds/DataWriterListener.h" #include "dds4ccm/impl/ndds/TypeSupport.h" +#include "dds4ccm/impl/ndds/Utils.h" #include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h" #include "dds4ccm/impl/ndds/convertors/Duration_t.h" @@ -93,8 +92,7 @@ namespace CIAO ::DDS::DataWriter_ptr DDS_Publisher_i::create_datawriter_with_profile (::DDS::Topic_ptr a_topic, - const char* library_name, - const char *profile_name, + const char* qos_profile, ::DDS::DataWriterListener_ptr a_listener, ::DDS::StatusMask mask) { @@ -105,8 +103,9 @@ namespace CIAO if (!topic) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Publisher_i::create_datawriter_with_profile - " - "Error: Unable to cast provided topic to its servant.\n")); + "DDS_Publisher_i::create_datawriter_with_profile <%C>- " + "Error: Unable to cast provided topic to its servant.\n", + qos_profile)); return ::DDS::DataWriter::_nil (); } @@ -117,18 +116,25 @@ namespace CIAO DDS_DataWriterListener_i (a_listener, 0), ::CORBA::NO_MEMORY ()); } + + char * lib_name = get_library_name(qos_profile); + char * prof_name = get_profile_name(qos_profile); + DDSDataWriter *ccm_dds_dw = this->rti_entity ()->create_datawriter_with_profile ( topic->get_rti_entity (), - library_name, - profile_name, + lib_name, + prof_name, ccm_dds_drl, mask); + ACE_OS::free (lib_name); + ACE_OS::free (prof_name); if (!ccm_dds_dw) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO - "DDS_Publisher_i::create_datawriter_with_profile - " - "Error: RTI Topic returned a nil datawriter.\n")); + "DDS_Publisher_i::create_datawriter_with_profile <%C> - " + "Error: RTI Topic returned a nil datawriter.\n", + qos_profile)); delete ccm_dds_drl; return ::DDS::DataWriter::_nil (); } @@ -136,9 +142,8 @@ namespace CIAO { DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO "DDS_Publisher_i::create_datawriter_with_profile - " - "Successfully created datawriter with profile <%C#%C>.\n", - library_name, - profile_name)); + "Successfully created datawriter with profile <%C>.\n", + qos_profile)); } ::DDS::DataWriter_var retval = diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h index cea2dc04712..dcf185d9bd5 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h @@ -11,7 +11,7 @@ #define PUBLISHER_T_H_ #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "tao/LocalObject.h" class DDSPublisher; @@ -40,8 +40,7 @@ namespace CIAO virtual ::DDS::DataWriter_ptr create_datawriter_with_profile ( ::DDS::Topic_ptr a_topic, - const char* library_name, - const char *profile_name, + const char* qos_profile, ::DDS::DataWriterListener_ptr a_listener, ::DDS::StatusMask mask); diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h index e0f6218660b..78196e11f9a 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h @@ -10,7 +10,7 @@ #ifndef DDSPUBLISHERLISTENER_T_H_ #define DDSPUBLISHERLISTENER_T_H_ -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" #include "ndds/ndds_cpp.h" diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h index 55ebb39adb0..da7cd6fffeb 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h @@ -11,7 +11,7 @@ #define QUERYCONDITION_T_H_ #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "tao/LocalObject.h" class DDSQueryCondition; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h index e3f6d3022a8..c2e78fa6171 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h @@ -11,7 +11,7 @@ #define READCONDITION_T_H_ #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "tao/LocalObject.h" class DDSReadCondition; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h index 26173fe1863..7e39833fe1a 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h @@ -11,7 +11,7 @@ #define DDS4CCM_STATUSCONDITION_H #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "tao/LocalObject.h" class DDSStatusCondition; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp index 44d49a789a6..4cd72de9ebc 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp @@ -8,8 +8,8 @@ #include "dds4ccm/impl/ndds/StatusCondition.h" #include "dds4ccm/impl/ndds/DomainParticipant.h" #include "dds4ccm/impl/ndds/TypeSupport.h" +#include "dds4ccm/impl/ndds/Utils.h" -#include "dds4ccm/impl/Utils.h" #include "dds4ccm/impl/ndds/SubscriberListener.h" #include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h" @@ -105,31 +105,42 @@ namespace CIAO DDSDataReader * DDS_Subscriber_i::create_datareader_with_profile ( DDSContentFilteredTopic * topic, - const char * library_name, - const char * profile_name, + const char * qos_profile, DDSDataReaderListener * ccm_dds_drl, ::DDS::StatusMask mask) { - return this->rti_entity ()->create_datareader_with_profile (topic, - library_name, - profile_name, + char * lib_name = get_library_name(qos_profile); + char * prof_name = get_profile_name(qos_profile); + + DDSDataReader * dr = this->rti_entity ()->create_datareader_with_profile ( + topic, + lib_name, + prof_name, ccm_dds_drl, mask); + ACE_OS::free (lib_name); + ACE_OS::free (prof_name); + + return dr; } DDSDataReader * DDS_Subscriber_i::create_datareader_with_profile ( DDSTopic * topic, - const char * library_name, - const char * profile_name, + const char * qos_profile, DDSDataReaderListener * ccm_dds_drl, ::DDS::StatusMask mask) { - return this->rti_entity ()->create_datareader_with_profile (topic, - library_name, - profile_name, + char * lib_name = get_library_name (qos_profile); + char * prof_name = get_profile_name (qos_profile); + DDSDataReader * dr = this->rti_entity ()->create_datareader_with_profile (topic, + lib_name, + prof_name, ccm_dds_drl, mask); + ACE_OS::free (lib_name); + ACE_OS::free (prof_name); + return dr; } ::DDS::DataReader_ptr @@ -207,8 +218,7 @@ namespace CIAO ::DDS::DataReader_ptr DDS_Subscriber_i::create_datareader_with_profile ( ::DDS::TopicDescription_ptr a_topic, - const char * library_name, - const char * profile_name, + const char * qos_profile, ::DDS::DataReaderListener_ptr a_listener, ::DDS::StatusMask mask) { @@ -231,17 +241,17 @@ namespace CIAO if (!cf_topic) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Subscriber_i::create_datareader_with_profile - " + "DDS_Subscriber_i::create_datareader_with_profile <%C> - " "Error: Unable to cast provided topic to one " - "of its servant.\n")); + "of its servant.\n", + qos_profile)); delete ccm_dds_drl; return ::DDS::DataReader::_nil (); } else { ccm_dds_dr = this->create_datareader_with_profile (cf_topic->get_rti_entity (), - library_name, - profile_name, + qos_profile, ccm_dds_drl, mask); } @@ -249,8 +259,7 @@ namespace CIAO else { ccm_dds_dr = this->create_datareader_with_profile (topic->get_rti_entity (), - library_name, - profile_name, + qos_profile, ccm_dds_drl, mask); } @@ -258,8 +267,9 @@ namespace CIAO if (!ccm_dds_dr) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO - "DDS_Subscriber_i::create_datareader_with_profile - " - "Error: RTI Topic returned a nil datareader.\n")); + "DDS_Subscriber_i::create_datareader_with_profile <%C>- " + "Error: RTI Topic returned a nil datareader.\n", + qos_profile)); delete ccm_dds_drl; return ::DDS::DataReader::_nil (); } @@ -267,9 +277,8 @@ namespace CIAO { DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO "DDS_Subscriber_i::create_datareader_with_profile - " - "Successfully created datareader with profile <%C#%C>.\n", - library_name, - profile_name)); + "Successfully created datareader with profile <%C>.\n", + qos_profile)); } ::DDS::DataReader_var reader = DDS_TypeSupport_i::create_datareader (ccm_dds_dr, diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h index 09b14377419..2210452069e 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h @@ -10,7 +10,7 @@ #ifndef SUBSCRIBER_T_H_ #define SUBSCRIBER_T_H_ -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "dds4ccm/impl/ndds/DataReader_T.h" #include "tao/LocalObject.h" @@ -49,8 +49,7 @@ namespace CIAO virtual ::DDS::DataReader_ptr create_datareader_with_profile ( ::DDS::TopicDescription_ptr a_topic, - const char* library_name, - const char *profile_name, + const char * qos_profile, ::DDS::DataReaderListener_ptr a_listener, ::DDS::StatusMask mask); @@ -127,16 +126,14 @@ namespace CIAO DDSDataReader * create_datareader_with_profile ( DDSContentFilteredTopic * topic, - const char* library_name, - const char *profile_name, + const char * qos_profile, DDSDataReaderListener * ccm_dds_drl, ::DDS::StatusMask mask); DDSDataReader * create_datareader_with_profile ( DDSTopic * topic, - const char* library_name, - const char *profile_name, + const char * qos_profile, DDSDataReaderListener * ccm_dds_drl, ::DDS::StatusMask mask); }; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h index f069a541375..299c8207478 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h @@ -10,7 +10,7 @@ #ifndef DDSSUBSCRIBERLISTENER_T_H_ #define DDSSUBSCRIBERLISTENER_T_H_ -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" #include "ndds/ndds_cpp.h" diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Topic.h b/CIAO/connectors/dds4ccm/impl/ndds/Topic.h index 5761aa43fa2..3f4c8c7b2e5 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Topic.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Topic.h @@ -10,7 +10,7 @@ #define NDDS_TOPIC_H #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "tao/LocalObject.h" class DDSTopic; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h index 15be9193827..16da8b629a9 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h @@ -11,7 +11,7 @@ #define TOPICDESCRIPTION_T_H_ #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "tao/LocalObject.h" class DDSTopicDescription; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h index 7b6b6699d49..55a41d0dbcb 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h @@ -10,7 +10,7 @@ #define DDSTOPICLISTENER_T_H_ #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "ndds/ndds_cpp.h" namespace CIAO diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.h b/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.h index 3d6d0884759..50370743000 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.h @@ -9,7 +9,7 @@ #ifndef NDDS_TYPESUPPORT_H_ #define NDDS_TYPESUPPORT_H_ -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" #include "dds4ccm/impl/ndds/DataWriter_T.h" #include "dds4ccm/impl/ndds/DataReader_T.h" diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp new file mode 100644 index 00000000000..5b6dc8e3151 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp @@ -0,0 +1,32 @@ +// $Id$ + +#include "dds4ccm/impl/ndds/Utils.h" +#include "ace/Log_Msg.h" +#include "ace/Tokenizer_T.h" + +namespace CIAO +{ + namespace NDDS + { + char * get_library_name (const char * qos_profile) + { + char* buf = ACE_OS::strdup (qos_profile); + ACE_Tokenizer_T<char> tok (buf); + tok.delimiter_replace ('#', 0); + char * ret = ACE_OS::strdup (tok.next ()); + ACE_OS::free (buf); + return ret; + } + + char * get_profile_name (const char * qos_profile) + { + char* buf = ACE_OS::strdup (qos_profile); + ACE_Tokenizer_T<char> tok (buf); + tok.delimiter_replace ('#', 0); + tok.next (); + char * ret = ACE_OS::strdup (tok.next ()); + ACE_OS::free (buf); + return ret; + } + } +} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Utils.h b/CIAO/connectors/dds4ccm/impl/ndds/Utils.h new file mode 100644 index 00000000000..7ce5cf27201 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Utils.h @@ -0,0 +1,24 @@ +/** + * @file Utils.h + * @author Marcel Smit <msmit@remedy.nl> + * + * $Id$ + * + * Misc utility classes for NDDS. + */ + +#ifndef NDDS_UTILS_H_ +#define NDDS_UTILS_H_ + +#include "ace/String_Base.h" + +namespace CIAO +{ + namespace NDDS + { + char * get_library_name (const char * qos_profile); + char * get_profile_name (const char * qos_profile); + } +} + +#endif /* NDDS_UTILS_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp b/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp index b503a5ff9b6..8e9ed9b86be 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp @@ -2,8 +2,6 @@ #include "WaitSet.h" -#include "dds4ccm/idl/dds4ccm_BaseC.h" - #include "ndds/ndds_cpp.h" #include "dds4ccm/impl/ndds/Condition.h" @@ -15,7 +13,6 @@ #include "dds4ccm/impl/logger/Log_Macros.h" - namespace CIAO { namespace NDDS @@ -132,7 +129,9 @@ namespace CIAO ::DDS::InstanceHandle_t DDS_WaitSet_i::check_handle ( const ::DDS::InstanceHandle_t & instance_handle, - const ::DDS::InstanceHandle_t & lookup_handle) + const ::DDS::InstanceHandle_t & lookup_handle, + bool & error, + bool & non_existent) { ::DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL; hnd <<= instance_handle; @@ -140,17 +139,21 @@ namespace CIAO ::DDS_InstanceHandle_t lookup_hnd = ::DDS_HANDLE_NIL; lookup_hnd <<= lookup_handle; + ::DDS::InstanceHandle_t ret = ::DDS::HANDLE_NIL; + if (!DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL) && !DDS_InstanceHandle_equals (&hnd, &lookup_hnd)) { - throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + error = true; } - if (DDS_InstanceHandle_equals (&lookup_hnd, &::DDS_HANDLE_NIL)) + else if (DDS_InstanceHandle_equals (&lookup_hnd, &::DDS_HANDLE_NIL)) { - throw ::CCM_DDS::NonExistent (); + non_existent = true; + } + else + { + ret <<= lookup_hnd; } - ::DDS::InstanceHandle_t ret = ::DDS::HANDLE_NIL; - ret <<= lookup_hnd; return ret; } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.h b/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.h index c0b5af69059..1c2d6c68d69 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.h @@ -9,7 +9,7 @@ #ifndef WAITSET_H_ #define WAITSET_H_ -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "tao/LocalObject.h" #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" @@ -50,7 +50,9 @@ namespace CIAO ::DDS::InstanceHandle_t check_handle (const ::DDS::InstanceHandle_t & instance_handle, - const ::DDS::InstanceHandle_t & lookup_handle); + const ::DDS::InstanceHandle_t & lookup_handle, + bool & error, + bool & non_existent); bool check_condition (::DDS::ReadCondition_ptr rc, ::DDS::QueryCondition_ptr qc, diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ndds.mpc b/CIAO/connectors/dds4ccm/impl/ndds/ndds.mpc index 7db6e9a0027..bd2edd5907a 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/ndds.mpc +++ b/CIAO/connectors/dds4ccm/impl/ndds/ndds.mpc @@ -1,6 +1,7 @@ +// -*- MPC -*- // $Id$ -project(CIAO_DDS4CCM_DDS_NDDS) : install, dds4ccm_skel, dds4ccm_lem_stub, taolib, \ +project(CIAO_DDS4CCM_DDS_NDDS) : install, ndds_lem_stub, taolib, \ ciao_output, dds4ccm_logger, nddslib { dynamicflags += DDS4CCM_DDS_NDDS_BUILD_DLL @@ -33,5 +34,6 @@ project(CIAO_DDS4CCM_DDS_NDDS) : install, dds4ccm_skel, dds4ccm_lem_stub, taolib TopicListener.cpp TypeSupport.cpp WaitSet.cpp + Utils.cpp } } diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp index b82ae41524e..d8cbb1f5483 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp @@ -102,7 +102,7 @@ write_back (LatencyTest & an_instance) try { - test_data_writer_->write(an_instance, ::DDS::HANDLE_NIL); + test_data_writer_->write(an_instance, DDS_HANDLE_NIL); } catch (const ::CORBA::Exception& ex) { diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp index 6ece715ee1b..f5e1b98106c 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp @@ -34,8 +34,8 @@ ACE_UINT64 start_time_ = 0; ACE_UINT64 start_time_test_ = 0; ACE_UINT64 end_time_test_ = 0; -ACE_UINT64 * duration_times_; -CORBA::Short * datalen_range_; +ACE_UINT64 * duration_times_ = 0; +CORBA::Short * datalen_range_ = 0; ACE_UINT64 clock_overhead_; LatencyTest * instance_ = 0; @@ -166,6 +166,7 @@ stop (void) void init_values (void) { + delete [] duration_times_; duration_times_ = new ACE_UINT64[iterations_]; datalen_range_ = new CORBA::Short[nr_of_runs_]; int start = 16; @@ -214,6 +215,7 @@ void reset_results (void) { count_ = 0; + delete [] duration_times_; duration_times_ = new ACE_UINT64[iterations_]; tv_total_ = 0L; tv_max_ = 0L; @@ -594,7 +596,9 @@ clean_exit: ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); main_result = 1; } - } + } + delete [] datalen_range_; + delete [] duration_times_; return main_result; } diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp index 213853915b6..64a37d7e9b5 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp @@ -28,8 +28,8 @@ CORBA::Long seq_num_ = 0; CORBA::Double sigma_duration_squared_; struct RTINtpTime start_time_; -ACE_UINT64 * duration_times_; -CORBA::Short * datalen_range_; +ACE_UINT64 * duration_times_ = 0; +CORBA::Short * datalen_range_ = 0; ACE_UINT64 clock_overhead_; RTIClock *timer = 0; LatencyTest * instance_ = 0; @@ -141,6 +141,7 @@ calculate_clock_overhead (void) void init_values (void) { + delete [] duration_times_; duration_times_ = new ACE_UINT64[iterations_]; datalen_range_ = new CORBA::Short[nr_of_runs_]; int start = 16; @@ -192,6 +193,7 @@ void reset_results (void) { count_ = 0; + delete [] duration_times_; duration_times_ = new ACE_UINT64[iterations_]; tv_total_ = 0L; tv_max_ = 0L; @@ -555,7 +557,9 @@ clean_exit: ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); main_result = 1; } - } + } + delete [] datalen_range_; + delete [] duration_times_; return main_result; } diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp index 6e667f6440f..27520706a94 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp @@ -99,7 +99,7 @@ CORBA::UShort domain_id = 0; instance_cmd->final_publisher_effort = max_load; try { - cmd_data_writer->write(*instance_cmd,::DDS::HANDLE_NIL); + cmd_data_writer->write(*instance_cmd, DDS_HANDLE_NIL); } catch (const ::CORBA::Exception& ex) { @@ -118,7 +118,7 @@ CORBA::UShort domain_id = 0; { try { - test_data_writer->write(*instance,::DDS::HANDLE_NIL); + test_data_writer->write(*instance, DDS_HANDLE_NIL); ++number_of_msg; } catch (const ::CORBA::Exception&) @@ -138,7 +138,7 @@ CORBA::UShort domain_id = 0; { test_complete = true; instance_cmd->command = THROUGHPUT_COMMAND_COMPLETE; - cmd_data_writer->write ( *instance_cmd, ::DDS::HANDLE_NIL); + cmd_data_writer->write ( *instance_cmd, DDS_HANDLE_NIL); } if (!test_complete) { diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h index 0f1bcf0adc0..1ad96bb71a4 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h @@ -60,7 +60,7 @@ namespace CIAO_Perf_Keyed_Test_Receiver_Impl virtual ~info_listen_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PerfKeyedTest::Listener. */ + /** Operations and attributes from CCM_DDS::PerfKeyedTest::Listener. */ virtual void on_one_data (const ::PerfKeyedTest & datum, diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h index 932b324986f..0f5a5fc8495 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h @@ -79,7 +79,7 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl virtual ~connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, @@ -128,7 +128,7 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl virtual ~ping_listen_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PerfKeyedTest::Listener. */ + /** Operations and attributes from CCM_DDS::PerfKeyedTest::Listener. */ virtual void on_one_data (const ::PerfKeyedTest & datum, diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h index 2668b7497b6..a15f85c72f0 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h @@ -57,7 +57,7 @@ namespace CIAO_LatencyTT_Test_Receiver_Impl virtual ~info_listen_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::LatencyTT_Test::LatencyTTTestConn::Listener. */ + /** Operations and attributes from LatencyTT_Test::LatencyTTTestConn::Listener. */ virtual void on_one_data (const ::LatencyTTTest & datum, diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp index 091a3fa41a9..b95359803cc 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp @@ -208,15 +208,16 @@ namespace CIAO_LatencyTT_Test_Sender_Impl ACE_NEW_THROW_EX (this->ticker_, WriteTicker (*this), ::CORBA::NO_MEMORY ()); + ACE_NEW_THROW_EX (this->datalen_range_, + ::CORBA::Short[this->nr_of_runs_], + ::CORBA::NO_MEMORY ()); } Sender_exec_i::~Sender_exec_i (void) { delete this->ticker_; - if (this->duration_times_) - { - delete this->duration_times_; - } + delete [] this->duration_times_; + delete [] datalen_range_; } // Supported operations and attributes. @@ -309,11 +310,7 @@ namespace CIAO_LatencyTT_Test_Sender_Impl void Sender_exec_i::reset_results() { - if (this->duration_times_) - { - delete this->duration_times_; - duration_times_ = 0; - } + delete [] this->duration_times_; this->count_ = 0; ACE_NEW_THROW_EX (this->duration_times_, @@ -475,17 +472,10 @@ namespace CIAO_LatencyTT_Test_Sender_Impl void Sender_exec_i::init_values (void) { - if (this->duration_times_) - { - delete this->duration_times_; - duration_times_ = 0; - } + delete [] this->duration_times_; ACE_NEW_THROW_EX (this->duration_times_, ACE_UINT64[this->iterations_], ::CORBA::NO_MEMORY ()); - ACE_NEW_THROW_EX (this->datalen_range_, - ::CORBA::Short[this->nr_of_runs_], - ::CORBA::NO_MEMORY ()); int start = 16; for (int i = 0; i < this->nr_of_runs_; i++) { diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h index c08e13fa32a..4a3da2f9b56 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h @@ -74,7 +74,7 @@ namespace CIAO_LatencyTT_Test_Sender_Impl virtual ~ping_listen_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::LatencyTT_Test::LatencyTTTestConn::Listener. */ + /** Operations and attributes from LatencyTT_Test::LatencyTTTestConn::Listener. */ virtual void on_one_data (const ::LatencyTTTest & datum, @@ -107,7 +107,7 @@ namespace CIAO_LatencyTT_Test_Sender_Impl virtual ~connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h index 4051ec8ea27..c2a917ad730 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h @@ -58,7 +58,7 @@ namespace CIAO_Throughput_Receiver_Impl virtual ~info_listen_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::Throughput::ThroughputTestConn::Listener. */ + /** Operations and attributes from Throughput::ThroughputTestConn::Listener. */ virtual void on_one_data (const ::ThroughputTest & datum, @@ -89,7 +89,7 @@ namespace CIAO_Throughput_Receiver_Impl virtual ~command_listen_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::Throughput::ThroughputCommandConn::Listener. */ + /** Operations and attributes from Throughput::ThroughputCommandConn::Listener. */ virtual void on_one_data (const ::ThroughputCommand & datum, diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h index 5290c2a0cf7..aef97138c83 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h @@ -76,7 +76,7 @@ namespace CIAO_Throughput_Sender_Impl virtual ~connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h index 5764355b714..b535c1d965a 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h @@ -79,7 +79,7 @@ namespace CIAO_CSL_SRTest_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::CSL_SR_Connector::Listener. */ + /** Operations and attributes from CSL_SR_Connector::Listener. */ virtual void on_one_data (const ::TestTopic & datum, @@ -109,7 +109,7 @@ namespace CIAO_CSL_SRTest_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -140,7 +140,7 @@ namespace CIAO_CSL_SRTest_Receiver_Impl virtual ~info_out_connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h index 468e77f4dfa..847e43dbc9b 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h @@ -106,7 +106,6 @@ namespace CIAO_CSL_SRTest_Sender_Impl pulse_Generator * ticker_; CORBA::ULong rate_; - TAO_SYNCH_MUTEX mutex_; typedef std::map<ACE_CString, TestTopic_var> CSL_SRTest_Table; CSL_SRTest_Table _ktests_; //@} diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h index 34925cee8f1..f590a972578 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h @@ -75,7 +75,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::CSL_US_Connector::Listener. */ + /** Operations and attributes from CSL_US_Connector::Listener. */ virtual void on_one_data (const ::TestTopic & datum, @@ -104,7 +104,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -133,7 +133,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl virtual ~info_read_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -166,7 +166,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl virtual ~info_out_connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h index 24c92556a93..a6c73ce7ad7 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h @@ -84,7 +84,7 @@ namespace CIAO_CSL_USTest_Sender_Impl virtual ~test_topic_connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h index d568fa657bf..a5842ff4581 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h @@ -48,7 +48,7 @@ namespace CIAO_CoherentUpdate_Test_Receiver_Impl Receiver_exec_i & callback); virtual ~reader_start_exec_i (void); - // Operations and attributes from ::CoherentUpdateStarter + // Operations and attributes from CoherentUpdateStarter virtual void set_reader_properties ( diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h index 6e1756ccfb6..170edd54ad8 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h @@ -48,7 +48,7 @@ namespace CIAO_CoherentUpdate_Test_Sender_Impl virtual ~restart_updater_exec_i (void); //@{ - /** Operations and attributes from ::CoherentUpdateRestarter. */ + /** Operations and attributes from CoherentUpdateRestarter. */ virtual void restart_update (void); diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h index 7cca8937588..3a5231ed465 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h @@ -76,7 +76,7 @@ namespace CIAO_CoherentWrite_Test_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -107,7 +107,7 @@ namespace CIAO_CoherentWrite_Test_Receiver_Impl virtual ~reader_start_exec_i (void); //@{ - /** Operations and attributes from ::CoherentWriteStarter. */ + /** Operations and attributes from CoherentWriteStarter. */ virtual void set_reader_properties (::CORBA::UShort nr_iterations); diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h index 5fa8f7ff74f..7fe656ef77a 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h @@ -72,7 +72,7 @@ namespace CIAO_CoherentWrite_Test_Sender_Impl virtual ~restart_writer_exec_i (void); //@{ - /** Operations and attributes from ::CoherentWriteRestarter. */ + /** Operations and attributes from CoherentWriteRestarter. */ virtual void restart_write (void); diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h index 57913ace914..bd14373e80c 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h @@ -58,7 +58,7 @@ namespace CIAO_CFTLE_Test_Receiver_Impl virtual ~info_listen_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::Listener. */ + /** Operations and attributes from CFTLE_Test::ContentFilteredTopicListenEventTestConnector::Listener. */ virtual void on_one_data (const ::ContentFilteredTopicListenEventTest & datum, @@ -89,7 +89,7 @@ namespace CIAO_CFTLE_Test_Receiver_Impl virtual ~info_listen_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h index f3a935f7632..7270ef818a5 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h @@ -77,7 +77,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl virtual ~get_port_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -106,7 +106,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl virtual ~read_port_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -136,7 +136,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl virtual ~reader_start_exec_i (void); //@{ - /** Operations and attributes from ::ReadGetStarter. */ + /** Operations and attributes from ReadGetStarter. */ virtual void set_reader_properties (::CORBA::UShort nr_keys, diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h index 0f498589c14..7514ef2a334 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h @@ -70,7 +70,7 @@ namespace CIAO_ReadGet_Test_Sender_Impl virtual ~restart_writer_exec_i (void); //@{ - /** Operations and attributes from ::ReadGetRestarter. */ + /** Operations and attributes from ReadGetRestarter. */ virtual void restart_write (void); diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl index 60f9bc20b6e..d64b229d961 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl @@ -218,8 +218,8 @@ for ($i = 0; $i < $nr_daemon; ++$i) { } } -print "Sleeping 30 seconds to allow task to complete\n"; -sleep (30); +print "Sleeping 40 seconds to allow task to complete\n"; +sleep (40); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; @@ -227,7 +227,7 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $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 ()); +$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h index 4c22ba32a15..7c6b27d0317 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h @@ -57,7 +57,7 @@ namespace CIAO_Writer_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::WriterTestConnector::Listener. */ + /** Operations and attributes from WriterTestConnector::Listener. */ virtual void on_one_data (const ::WriterTest & datum, @@ -86,7 +86,7 @@ namespace CIAO_Writer_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h b/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h index e1395229492..8db6b7565e6 100644 --- a/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h +++ b/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h @@ -6,9 +6,9 @@ #include "connectors/dds4ccm/impl/DDS_Event_Connector_T.h" #include "connectors/dds4ccm/impl/DDS_State_Connector_T.h" -template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, typename SEQ_TYPE> class MyEvent_Connector_T - : public virtual DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE> + : public virtual DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, SEQ_TYPE> { virtual ::CCM_fooA_ptr get_my_foo (void) { @@ -16,9 +16,9 @@ class MyEvent_Connector_T } }; -template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, typename SEQ_TYPE> class MyState_Connector_T - : public virtual DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE> + : public virtual DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, SEQ_TYPE> { virtual ::CCM_fooB_ptr get_my_foo (void) { diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h index 2856eeedc6c..58fed5bc8fa 100644 --- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h @@ -98,7 +98,7 @@ namespace CIAO_Getter_Test_Receiver_Impl virtual ~info_get_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -127,7 +127,7 @@ namespace CIAO_Getter_Test_Receiver_Impl virtual ~info_fixed_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -157,7 +157,7 @@ namespace CIAO_Getter_Test_Receiver_Impl virtual ~getter_invoke_exec_i (void); //@{ - /** Operations and attributes from ::GetInvoker. */ + /** Operations and attributes from GetInvoker. */ virtual void start_timeout_get_one (void); diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h index 632d2413d0a..46282c0d52f 100644 --- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h @@ -72,7 +72,7 @@ namespace CIAO_Getter_Test_Sender_Impl virtual ~info_out_connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h index 94a264cc981..032a12b8ac8 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h @@ -77,7 +77,7 @@ namespace CIAO_Keyed_Test_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h index d984727fda0..391097fd5e0 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h @@ -58,7 +58,7 @@ namespace CIAO_Writer_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::WriterTestConnector::Listener. */ + /** Operations and attributes from WriterTestConnector::Listener. */ virtual void on_one_data (const ::WriterTest & datum, @@ -89,7 +89,7 @@ namespace CIAO_Writer_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h index 9f7a3d81bc4..57e5260454d 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h @@ -57,7 +57,7 @@ namespace CIAO_RG_LateBinding_Receiver_Impl virtual ~info_get_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -86,7 +86,7 @@ namespace CIAO_RG_LateBinding_Receiver_Impl virtual ~info_read_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -116,7 +116,7 @@ namespace CIAO_RG_LateBinding_Receiver_Impl virtual ~reader_start_exec_i (void); //@{ - /** Operations and attributes from ::ReaderStarter. */ + /** Operations and attributes from ReaderStarter. */ virtual void start_read (void); diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h index c5b42c72cee..7347d653922 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h @@ -55,7 +55,7 @@ namespace CIAO_WU_LateBinding_Receiver_Impl virtual ~info_out_event_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::WU_LateBinding::WU_LateBindingTestConnector::Listener. */ + /** Operations and attributes from WU_LateBinding::WU_LateBindingTestConnector::Listener. */ virtual void on_one_data (const ::WU_LateBindingTest & datum, @@ -84,7 +84,7 @@ namespace CIAO_WU_LateBinding_Receiver_Impl virtual ~info_out_event_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -113,7 +113,7 @@ namespace CIAO_WU_LateBinding_Receiver_Impl virtual ~info_out_state_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::WU_LateBinding::WU_LateBindingTestConnector::StateListener. */ + /** Operations and attributes from WU_LateBinding::WU_LateBindingTestConnector::StateListener. */ virtual void on_creation (const ::WU_LateBindingTest & datum, @@ -150,7 +150,7 @@ namespace CIAO_WU_LateBinding_Receiver_Impl virtual ~info_out_state_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h index 9a9441137e4..a1dbfe0e78d 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h @@ -58,7 +58,7 @@ namespace CIAO_LNE_Test_Receiver_Impl virtual ~info_listen_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::LNE_Test::ListenNotEnabledTestConnector::Listener. */ + /** Operations and attributes from LNE_Test::ListenNotEnabledTestConnector::Listener. */ virtual void on_one_data (const ::ListenNotEnabledTest & datum, @@ -89,7 +89,7 @@ namespace CIAO_LNE_Test_Receiver_Impl virtual ~info_listen_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp index e8941c8fd8c..7e6900ee192 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp @@ -55,10 +55,15 @@ namespace CIAO_LNE_Test_Sender_Impl : keys_ (5) , iterations_ (10) { + ACE_NEW_THROW_EX (this->rh_, + WriteManyHandler (*this), + ::CORBA::NO_MEMORY ()); + } Sender_exec_i::~Sender_exec_i (void) { + delete this->rh_; } // Supported operations and attributes. @@ -124,8 +129,7 @@ namespace CIAO_LNE_Test_Sender_Impl void Sender_exec_i::start (void) { - WriteManyHandler *rh = new WriteManyHandler (*this); - this->reactor ()->notify (rh); + this->reactor ()->notify (this->rh_); } // Component attributes and port operations. diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h index 94c4cd36caf..59a455b4415 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h @@ -114,7 +114,7 @@ namespace CIAO_LNE_Test_Sender_Impl //@{ /** User defined members. */ - + WriteManyHandler *rh_; //@} //@{ diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp index dd2fe7096a3..08fd5a8cf49 100644 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp @@ -2,34 +2,34 @@ #include "connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h" -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::DDS_MT_Event_Connector_T (void) +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::DDS_MT_Event_Connector_T (void) : reactor_ (0) { } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::supplier_sq_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_sq_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_sq_data (void) { - ACE_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_sq_data"); + ACE_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_sq_data"); typename CCM_TYPE::supplier_sq_traits::data_type::_var_type dw = this->sq_supplier_.get_data (); return CCM_TYPE::supplier_sq_traits::data_type::_duplicate (dw.in ()); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::supplier_sq_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_sq_dds_entity (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_sq_dds_entity (void) { return CCM_TYPE::supplier_sq_traits::dds_entity_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_consumer_sq_traits::fresh_data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_sq_fresh_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_sq_fresh_data (void) { typename CCM_TYPE::pull_consumer_sq_traits::fresh_data_type::_var_type fresh_data = this->pull_consumer_sq_.get_fresh_data (); @@ -37,84 +37,84 @@ DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::g fresh_data.in ()); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_consumer_sq_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_sq_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_sq_data (void) { return CCM_TYPE::pull_consumer_sq_traits::data_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_consumer_sq_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_sq_dds_entity (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_sq_dds_entity (void) { return CCM_TYPE::pull_consumer_sq_traits::dds_entity_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter* -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_consumer_sq_filter (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_sq_filter (void) { return 0; } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_consumer_sq_filter (const ::CCM_DDS::QueryFilter&) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_sq_filter (const ::CCM_DDS::QueryFilter&) { } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::CCM_ContentFilterSetting_ptr -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_sq_filter_config(void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_sq_filter_config(void) { return ::CCM_DDS::CCM_ContentFilterSetting::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::CCM_ContentFilterSetting* -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_sq_filter_config(void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_sq_filter_config(void) { return ::CCM_DDS::CCM_ContentFilterSetting::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter * -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_consumer_sq_filter (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_sq_filter (void) { return 0; } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_consumer_sq_filter (const ::CCM_DDS::QueryFilter &) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_sq_filter (const ::CCM_DDS::QueryFilter &) { } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_consumer_sq_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_sq_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_sq_data (void) { return CCM_TYPE::push_consumer_sq_traits::data_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_consumer_sq_traits::data_control_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_sq_data_control (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_sq_data_control (void) { return CCM_TYPE::push_consumer_sq_traits::data_control_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_consumer_sq_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_sq_dds_entity (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_sq_dds_entity (void) { return CCM_TYPE::push_consumer_sq_traits::dds_entity_type::_nil (); @@ -122,28 +122,28 @@ DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::g //TRIANGEL -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::supplier_tr_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_tr_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_tr_data (void) { - ACE_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_tr_data"); + ACE_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_tr_data"); typename CCM_TYPE::supplier_sq_traits::data_type::_var_type dw = this->tr_supplier_.get_data (); return CCM_TYPE::supplier_sq_traits::data_type::_duplicate (dw.in ()); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::supplier_tr_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_tr_dds_entity (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_tr_dds_entity (void) { return CCM_TYPE::supplier_tr_traits::dds_entity_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_consumer_tr_traits::fresh_data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_tr_fresh_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_tr_fresh_data (void) { typename CCM_TYPE::pull_consumer_tr_traits::fresh_data_type::_var_type fresh_data = this->pull_consumer_tr_.get_fresh_data (); @@ -152,88 +152,88 @@ DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::g fresh_data.in ()); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_consumer_tr_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_tr_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_tr_data (void) { return CCM_TYPE::pull_consumer_tr_traits::data_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_consumer_tr_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_tr_dds_entity (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_tr_dds_entity (void) { return CCM_TYPE::pull_consumer_tr_traits::dds_entity_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter* -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_consumer_tr_filter (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_tr_filter (void) { return 0; } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_consumer_tr_filter (const ::CCM_DDS::QueryFilter&) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_tr_filter (const ::CCM_DDS::QueryFilter&) { } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::CCM_ContentFilterSetting* -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_tr_filter_config(void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_tr_filter_config(void) { return ::CCM_DDS::CCM_ContentFilterSetting::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::CCM_ContentFilterSetting* -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_tr_filter_config(void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_tr_filter_config(void) { return ::CCM_DDS::CCM_ContentFilterSetting::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter * -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_consumer_tr_filter (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_tr_filter (void) { return 0; } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_consumer_tr_filter ( +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_tr_filter ( const ::CCM_DDS::QueryFilter &) { } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_consumer_tr_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_tr_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_tr_data (void) { return CCM_TYPE::push_consumer_tr_traits::data_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_consumer_tr_traits::data_control_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_tr_data_control (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_tr_data_control (void) { return CCM_TYPE::push_consumer_tr_traits::data_control_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_consumer_tr_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_tr_dds_entity (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_tr_dds_entity (void) { return CCM_TYPE::push_consumer_tr_traits::dds_entity_type::_nil (); @@ -241,163 +241,163 @@ DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::g //CIRCLE -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::supplier_cl_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_cl_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_cl_data (void) { - ACE_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_cl_data"); + ACE_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_cl_data"); typename CCM_TYPE::supplier_sq_traits::data_type::_var_type dw = this->cl_supplier_.get_data (); return CCM_TYPE::supplier_sq_traits::data_type::_duplicate (dw.in ()); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::supplier_cl_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_cl_dds_entity (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_cl_dds_entity (void) { return CCM_TYPE::supplier_cl_traits::dds_entity_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_consumer_cl_traits::fresh_data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_cl_fresh_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_cl_fresh_data (void) { return CCM_TYPE::pull_consumer_cl_traits::fresh_data_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_consumer_cl_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_cl_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_cl_data (void) { return CCM_TYPE::pull_consumer_cl_traits::data_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_consumer_cl_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_cl_dds_entity (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_cl_dds_entity (void) { return CCM_TYPE::pull_consumer_cl_traits::dds_entity_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter* -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_consumer_cl_filter (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_cl_filter (void) { return 0; } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_consumer_cl_filter (const ::CCM_DDS::QueryFilter&) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_cl_filter (const ::CCM_DDS::QueryFilter&) { } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::CCM_ContentFilterSetting* -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_cl_filter_config(void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_cl_filter_config(void) { return ::CCM_DDS::CCM_ContentFilterSetting::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::CCM_ContentFilterSetting* -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_cl_filter_config(void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_cl_filter_config(void) { return ::CCM_DDS::CCM_ContentFilterSetting::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter * -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_consumer_cl_filter (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_cl_filter (void) { return 0; } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_consumer_cl_filter (const ::CCM_DDS::QueryFilter &) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_cl_filter (const ::CCM_DDS::QueryFilter &) { } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_consumer_cl_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_cl_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_cl_data (void) { return CCM_TYPE::push_consumer_cl_traits::data_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_consumer_cl_traits::data_control_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_cl_data_control (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_cl_data_control (void) { typename CCM_TYPE::push_consumer_cl_traits::data_control_type::_var_type dlc = this->push_consumer_cl_.get_data_control (); return CCM_TYPE::push_consumer_cl_traits::data_control_type::_duplicate (dlc.in ()); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_consumer_cl_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_cl_dds_entity (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_cl_dds_entity (void) { return CCM_TYPE::push_consumer_cl_traits::dds_entity_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> char * -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topic_name_sq (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_sq (void) { return CORBA::string_dup (this->topic_name_sq_.in ()); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topic_name_sq ( +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_sq ( const char * topic_name_sq) { this->topic_name_sq_ = topic_name_sq; } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> char * -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topic_name_tr (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_tr (void) { return CORBA::string_dup (this->topic_name_tr_.in ()); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topic_name_tr ( +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_tr ( const char * topic_name_tr) { this->topic_name_tr_ = topic_name_tr; } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> char * -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topic_name_cl (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_cl (void) { return CORBA::string_dup (this->topic_name_cl_.in ()); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topic_name_cl ( +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_cl ( const char * topic_name_cl) { this->topic_name_cl_ = topic_name_cl; } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::create_topics ( +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::create_topics ( const char * typesupport_name) { this->init_topic (this->domain_participant_.in (), @@ -432,9 +432,9 @@ DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::c } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::configuration_complete (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::configuration_complete (void) { // Init default domain (Base_Connector) this->init_domain (this->domain_participant_.inout ()); @@ -456,38 +456,32 @@ DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::c this->sq_supplier_.configuration_complete ( this->topic_sq_.in (), this->publisher_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_); this->tr_supplier_.configuration_complete ( this->topic_tr_.in (), this->publisher_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_); this->cl_supplier_.configuration_complete ( this->topic_cl_.in (), this->publisher_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_); this->pull_consumer_sq_.configuration_complete ( this->topic_sq_.in (), this->subscriber_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_); this->pull_consumer_tr_.configuration_complete ( this->topic_tr_.in (), this->subscriber_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_); this->push_consumer_cl_.configuration_complete ( this->topic_cl_.in (), this->subscriber_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::activate_topics (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::activate_topics (void) { this->activate_topic (this->reactor_, this->topic_sq_.in (), @@ -500,9 +494,9 @@ DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::a this->topiclistener_cl_.inout ()); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_activate (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_activate (void) { this->activate_topics (); this->activate_subscriber (this->reactor_, @@ -535,9 +529,9 @@ DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::c this->reactor_); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::passivate_topics (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::passivate_topics (void) { ::DDS::TopicListener_var topic_listener = this->topiclistener_sq_._retn (); if (!::CORBA::is_nil (topic_listener.in ())) @@ -559,9 +553,9 @@ DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::p } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_passivate (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_passivate (void) { this->sq_supplier_.passivate (); this->tr_supplier_.passivate (); @@ -590,9 +584,9 @@ DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::c } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::remove_topics (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::remove_topics (void) { this->remove_topic (this->domain_participant_.in (), this->topic_sq_.inout ()); @@ -602,9 +596,9 @@ DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::r this->topic_cl_.inout ()); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_remove (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove (void) { this->sq_supplier_.remove (this->publisher_.in ()); this->tr_supplier_.remove (this->publisher_.in ()); diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h index e50f39abbd4..742e45bf8e8 100644 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h +++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h @@ -9,7 +9,7 @@ #include "connectors/dds4ccm/impl/DDS_Listen_T.h" #include "connectors/dds4ccm/impl/DataListenerControl_T.h" -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> class DDS_MT_Event_Connector_T : public virtual DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE> { diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl index a3cd3283b2c..ee1b9d1d180 100644 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl +++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl @@ -31,16 +31,16 @@ module CCM_DDS_MT // DDS MT Connector // ------------------ - connector DDS_MT_Event : CCM_DDS::DDS_TopicBase { - mirrorport DDS_Typed::DDS_Write supplier_sq; - mirrorport DDS_Typed::DDS_Get pull_consumer_sq; - mirrorport DDS_Typed::DDS_Listen push_consumer_sq; - mirrorport DDS_Typed::DDS_Write supplier_tr; - mirrorport DDS_Typed::DDS_Get pull_consumer_tr; - mirrorport DDS_Typed::DDS_Listen push_consumer_tr; - mirrorport DDS_Typed::DDS_Write supplier_cl; - mirrorport DDS_Typed::DDS_Get pull_consumer_cl; - mirrorport DDS_Typed::DDS_Listen push_consumer_cl; + connector DDS_MT_Event : CCM_DDS::DDS_Base { + mirrorport DDS_Typed::DDS_Write supplier_sq; + mirrorport DDS_Typed::DDS_Get pull_consumer_sq; + mirrorport DDS_Typed::DDS_Listen push_consumer_sq; + mirrorport DDS_Typed::DDS_Write supplier_tr; + mirrorport DDS_Typed::DDS_Get pull_consumer_tr; + mirrorport DDS_Typed::DDS_Listen push_consumer_tr; + mirrorport DDS_Typed::DDS_Write supplier_cl; + mirrorport DDS_Typed::DDS_Get pull_consumer_cl; + mirrorport DDS_Typed::DDS_Listen push_consumer_cl; attribute string topic_name_sq; attribute string topic_name_tr; diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h index 4909b2e35f5..5d775a81b1e 100644 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h @@ -77,7 +77,7 @@ namespace CIAO_Shapes_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::Shapes::Listener. */ + /** Operations and attributes from Shapes::Listener. */ virtual void on_one_data (const ::ShapeType & datum, diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp index 4bdee1494a4..94809ae55f9 100644 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp @@ -3,10 +3,8 @@ #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, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::FooConnector_Connector_T(void) +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) @@ -17,11 +15,9 @@ DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::FooConnector_Connector_T(voi /** * Type registration both topics **/ -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, - typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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> void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, - DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::register_type ( +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*/) { @@ -81,217 +77,195 @@ FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TY } } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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> +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, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::topic_name_t (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 (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, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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> void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, - DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::topic_name_t ( +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, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> -::CCM_DDS::CCM_ContentFilterSetting* - FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, - DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_push_consumer_t_filter_config(void) +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, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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::QueryFilter * - FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, - DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::push_consumer_t_filter (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 (void) { return this->push_consumer_t_.filter (); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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> void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::push_consumer_t_filter (const ::CCM_DDS::QueryFilter &filter) +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, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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> typename CCM_TYPE::push_consumer_t_traits::data_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_push_consumer_t_data (void) +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, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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> 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, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_push_consumer_t_data_control (void) +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, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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> 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, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_push_consumer_t_dds_entity (void) +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, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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> typename CCM_TYPE::observable_t_traits::data_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_observable_t_data (void) +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, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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> typename CCM_TYPE::observable_t_traits::dds_entity_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_observable_t_dds_entity (void) +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, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::topic_name_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 (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, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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> void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, - DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::topic_name_y ( +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, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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, FIXED_SEQ_TYPE_T, - DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_push_consumer_y_filter_config(void) +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, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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::QueryFilter * - FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, - DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::push_consumer_y_filter (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 (void) { return this->push_consumer_y_.filter (); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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> void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::push_consumer_y_filter (const ::CCM_DDS::QueryFilter &filter) +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, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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> typename CCM_TYPE::push_consumer_y_traits::data_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_push_consumer_y_data (void) +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, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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> 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, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_push_consumer_y_data_control (void) +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, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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> 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, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_push_consumer_y_dds_entity (void) +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, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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> typename CCM_TYPE::observable_y_traits::data_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_observable_y_data (void) +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, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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> typename CCM_TYPE::observable_y_traits::dds_entity_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_observable_y_dds_entity (void) +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, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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> void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::configuration_complete (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"); + DDS4CCM_TRACE ("FooConnector_Connector_T::configuration_complete"); // Init default domain in Base_Connector BaseConnector::configuration_complete (); @@ -378,11 +352,9 @@ DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::configuration_complete (void } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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> void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::ccm_activate (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 (); @@ -413,11 +385,9 @@ DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::ccm_activate (void) this->observable_y_.activate (); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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> void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::ccm_passivate (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"); @@ -483,11 +453,9 @@ DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::ccm_passivate (void) BaseConnector::ccm_passivate (); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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> void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::ccm_remove (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"); diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h index 9cde6c4300a..97c2fadd370 100644 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h +++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h @@ -10,8 +10,11 @@ #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, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_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> class FooConnector_Connector_T : public virtual DDS_Base_Connector_T<CCM_TYPE> { @@ -27,6 +30,12 @@ public: ::DDS::DomainParticipant_ptr participant, const char * typesupport_name); + virtual + void + unregister_type ( + ::DDS::DomainParticipant_ptr participant, + const char * typesupport_name); + /** * T type connector **/ diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h b/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h index 8d1c99a4b2c..d82ac3bf463 100644 --- a/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h +++ b/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h @@ -5,7 +5,7 @@ #include "connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h" -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> class DDS_PSAT_Event_Connector_T : public virtual DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE> { diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h index f089b8d43e4..53254d904ad 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h @@ -79,7 +79,7 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl virtual ~info_get_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -110,7 +110,7 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::PSL_DeadlineTest::PSLDeadlineConnector::Listener. */ + /** Operations and attributes from PSL_DeadlineTest::PSLDeadlineConnector::Listener. */ virtual void on_one_data (const ::TestTopic & datum, @@ -141,7 +141,7 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h index a91f001d09d..39bd9d3d234 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h @@ -76,7 +76,7 @@ namespace CIAO_PSL_DeadlineTest_Sender_Impl virtual ~test_topic_connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h index cd651b05e18..3fa443cd01a 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h @@ -80,7 +80,7 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl virtual ~info_get_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -111,7 +111,7 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::PSL_SampleLost::PSL_SampleLostConnector::Listener. */ + /** Operations and attributes from PSL_SampleLost::PSL_SampleLostConnector::Listener. */ virtual void on_one_data (const ::TestTopic & datum, @@ -142,7 +142,7 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h index 0e02fe99aeb..e4ce52b6b72 100644 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h @@ -108,7 +108,7 @@ namespace CIAO_Proxy_RW_Test_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::Proxy_RW_Test::ProxyReadWriteTestConnector::Listener. */ + /** Operations and attributes from Proxy_RW_Test::ProxyReadWriteTestConnector::Listener. */ virtual void on_one_data (const ::ProxyReadWriteTest & datum, @@ -137,7 +137,7 @@ namespace CIAO_Proxy_RW_Test_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -167,7 +167,7 @@ namespace CIAO_Proxy_RW_Test_Receiver_Impl virtual ~reader_start_exec_i (void); //@{ - /** Operations and attributes from ::ReaderStarter. */ + /** Operations and attributes from ReaderStarter. */ virtual void start_read (::ReaderStarter::assignment task); diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h index 584a6b1648f..d96a7d99519 100644 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h @@ -59,7 +59,7 @@ namespace CIAO_Proxy_RW_Test_Sender_Impl virtual ~restart_writer_exec_i (void); //@{ - /** Operations and attributes from ::ReadGetRestarter. */ + /** Operations and attributes from ReadGetRestarter. */ virtual void restart_write (::ReaderStarter::assignment task); @@ -85,7 +85,7 @@ namespace CIAO_Proxy_RW_Test_Sender_Impl virtual ~info_out_connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h index 406f79b1075..eaa92a8e150 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h @@ -74,7 +74,7 @@ namespace CIAO_Different_Test_Receiver_Impl virtual ~get_port_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -103,7 +103,7 @@ namespace CIAO_Different_Test_Receiver_Impl virtual ~read_port_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h index cba9d852e4b..128c8c3f1bd 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h @@ -60,7 +60,7 @@ namespace CIAO_QCLE_Test_Receiver_Impl virtual ~info_listen_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::QCLE_Test::QueryConditionListenEventTestConnector::Listener. */ + /** Operations and attributes from QCLE_Test::QueryConditionListenEventTestConnector::Listener. */ virtual void on_one_data (const ::QueryConditionListenEventTest & datum, @@ -91,7 +91,7 @@ namespace CIAO_QCLE_Test_Receiver_Impl virtual ~info_listen_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h index 9de8de6fb8a..88a8181b498 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h @@ -77,7 +77,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl virtual ~get_port_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -106,7 +106,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl virtual ~check_port_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -136,7 +136,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl virtual ~reader_start_exec_i (void); //@{ - /** Operations and attributes from ::ReadGetStarter. */ + /** Operations and attributes from ReadGetStarter. */ virtual void set_reader_properties (::CORBA::UShort nr_keys, diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h index f955431a65a..08d141131ee 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h @@ -69,7 +69,7 @@ namespace CIAO_ReadGet_Test_Sender_Impl virtual ~restart_writer_exec_i (void); //@{ - /** Operations and attributes from ::ReadGetRestarter. */ + /** Operations and attributes from ReadGetRestarter. */ virtual void restart_write (void); diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h index 8a4b8721999..5f0d50b7601 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h @@ -60,7 +60,7 @@ namespace CIAO_QCLS_Test_Receiver_Impl virtual ~info_state_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::QCLS_Test::QueryConditionListenStateTestConnector::StateListener. */ + /** Operations and attributes from QCLS_Test::QueryConditionListenStateTestConnector::StateListener. */ virtual void on_creation (const ::QueryConditionListenStateTest & datum, @@ -99,7 +99,7 @@ namespace CIAO_QCLS_Test_Receiver_Impl virtual ~info_state_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h index c2e3b60afbc..e381d094b8b 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h @@ -61,7 +61,7 @@ namespace CIAO_QCTL_Test_Receiver_Impl virtual ~info_listen_1_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::QCTL_Test::QueryConditionTwoListenersTestConnector::Listener. */ + /** Operations and attributes from QCTL_Test::QueryConditionTwoListenersTestConnector::Listener. */ virtual void on_one_data (const ::QueryConditionTwoListenersTest & datum, @@ -92,7 +92,7 @@ namespace CIAO_QCTL_Test_Receiver_Impl virtual ~info_listen_1_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -123,7 +123,7 @@ namespace CIAO_QCTL_Test_Receiver_Impl virtual ~info_listen_2_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::QCTL_Test::QueryConditionTwoListenersTestConnector::Listener. */ + /** Operations and attributes from QCTL_Test::QueryConditionTwoListenersTestConnector::Listener. */ virtual void on_one_data (const ::QueryConditionTwoListenersTest & datum, @@ -154,7 +154,7 @@ namespace CIAO_QCTL_Test_Receiver_Impl virtual ~info_listen_2_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h index 2afc8c74d6a..95641072238 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h @@ -78,7 +78,7 @@ namespace CIAO_QCTQ_Test_Receiver_Impl virtual ~get_port_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -108,7 +108,7 @@ namespace CIAO_QCTQ_Test_Receiver_Impl virtual ~reader_start_exec_i (void); //@{ - /** Operations and attributes from ::TwoQueriesStarter. */ + /** Operations and attributes from TwoQueriesStarter. */ virtual void set_reader_properties (::CORBA::UShort nr_keys, diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h index 1ca3235e710..bc20b7a51aa 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h @@ -71,7 +71,7 @@ namespace CIAO_QCTQ_Test_Sender_Impl virtual ~restart_writer_exec_i (void); //@{ - /** Operations and attributes from ::TwoQueriesRestarter. */ + /** Operations and attributes from TwoQueriesRestarter. */ virtual void restart_write (void); diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h index 4cb328fb92a..3ef77cae162 100644 --- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h @@ -76,7 +76,7 @@ namespace CIAO_Reader_Test_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::Reader_Test::ReaderTestConnector::Listener. */ + /** Operations and attributes from Reader_Test::ReaderTestConnector::Listener. */ virtual void on_one_data (const ::ReaderTest & datum, @@ -105,7 +105,7 @@ namespace CIAO_Reader_Test_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -135,7 +135,7 @@ namespace CIAO_Reader_Test_Receiver_Impl virtual ~reader_start_exec_i (void); //@{ - /** Operations and attributes from ::ReaderStarter. */ + /** Operations and attributes from ReaderStarter. */ virtual void start_read (void); diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h index 0105a075f86..e4db8b6eccd 100644 --- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h @@ -58,7 +58,7 @@ namespace CIAO_Reader_Test_Sender_Impl virtual ~info_out_connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h index 280940b1922..8efdf8c68bb 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h @@ -59,7 +59,7 @@ namespace CIAO_SL_Disabled_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::SL_Disabled::SL_DisabledConnector::StateListener. */ + /** Operations and attributes from SL_Disabled::SL_DisabledConnector::StateListener. */ virtual void on_creation (const ::TestTopic & datum, @@ -97,7 +97,7 @@ namespace CIAO_SL_Disabled_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h index 7716c9bc68a..aed8f79ae84 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h @@ -87,7 +87,7 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::SL_ManyByMany::SLManyByManyConnector::StateListener. */ + /** Operations and attributes from SL_ManyByMany::SLManyByManyConnector::StateListener. */ virtual void on_creation (const ::TestTopic & datum, @@ -130,7 +130,7 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h index 1d8f5b47211..df1f04ce71c 100644 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h @@ -63,7 +63,7 @@ namespace CIAO_SL_OneByOne_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::SL_OneByOne::SL_OneByOneConnector::StateListener. */ + /** Operations and attributes from SL_OneByOne::SL_OneByOneConnector::StateListener. */ virtual void on_creation (const ::TestTopic & datum, @@ -105,7 +105,7 @@ namespace CIAO_SL_OneByOne_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp index 8bade0c28de..38f49975bce 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp @@ -63,18 +63,28 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl if (ccm_dw1) { - DataWriter_type * typed_ccm_dw = - dynamic_cast <DataWriter_type *> (ccm_dw1->get_dds_entity ()); - if (typed_ccm_dw) + ::DDS::DataWriter_var tmp = ccm_dw1->get_dds_entity (); + if (! ::CORBA::is_nil (tmp.in ())) { - DDSDataWriter * dds_dw1 = typed_ccm_dw->get_rti_entity (); - DDSPublisher * dds_p1 = dds_dw1->get_publisher (); - this->dds_dp1_ = dds_p1->get_participant (); + DataWriter_type * typed_ccm_dw = + dynamic_cast <DataWriter_type *> (tmp.in ()); + if (typed_ccm_dw) + { + DDSDataWriter * dds_dw1 = typed_ccm_dw->get_rti_entity (); + DDSPublisher * dds_p1 = dds_dw1->get_publisher (); + this->dds_dp1_ = dds_p1->get_participant (); + } + else + { + ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " + "Error casting DataWriter 1 to typed DataWriter 1\n")); + throw ::CORBA::INTERNAL (); + } } else { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 1 to typed DataWriter 1\n")); + ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " + "Error getting DDS DataWriter 1.\n")); throw ::CORBA::INTERNAL (); } } @@ -107,18 +117,28 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl if (ccm_dw2) { - DataWriter_type * typed_ccm_dw = - dynamic_cast <DataWriter_type *> (ccm_dw2->get_dds_entity ()); - if (typed_ccm_dw) + ::DDS::DataWriter_var tmp = ccm_dw2->get_dds_entity (); + if (! ::CORBA::is_nil (tmp.in ())) { - DDSDataWriter * dds_dw2 = typed_ccm_dw->get_rti_entity (); - DDSPublisher * dds_p2 = dds_dw2->get_publisher (); - this->dds_dp2_ = dds_p2->get_participant (); + DataWriter_type * typed_ccm_dw = + dynamic_cast <DataWriter_type *> (tmp.in ()); + if (typed_ccm_dw) + { + DDSDataWriter * dds_dw2 = typed_ccm_dw->get_rti_entity (); + DDSPublisher * dds_p2 = dds_dw2->get_publisher (); + this->dds_dp2_ = dds_p2->get_participant (); + } + else + { + ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " + "Error casting DataWriter 2 to typed DataWriter 2\n")); + throw ::CORBA::INTERNAL (); + } } else { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 2 to typed DataWriter 2\n")); + ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " + "Error getting DDS DataWriter 2.\n")); throw ::CORBA::INTERNAL (); } } @@ -151,18 +171,28 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl if (ccm_dw3) { - DataWriter_type * typed_ccm_dw = - dynamic_cast <DataWriter_type *> (ccm_dw3->get_dds_entity ()); - if (typed_ccm_dw) + ::DDS::DataWriter_var tmp = ccm_dw3->get_dds_entity (); + if (! ::CORBA::is_nil (tmp.in ())) { - DDSDataWriter * dds_dw3 = typed_ccm_dw->get_rti_entity (); - DDSPublisher * dds_p3 = dds_dw3->get_publisher (); - this->dds_dp3_ = dds_p3->get_participant (); + DataWriter_type * typed_ccm_dw = + dynamic_cast <DataWriter_type *> (tmp.in ()); + if (typed_ccm_dw) + { + DDSDataWriter * dds_dw3 = typed_ccm_dw->get_rti_entity (); + DDSPublisher * dds_p3 = dds_dw3->get_publisher (); + this->dds_dp3_ = dds_p3->get_participant (); + } + else + { + ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " + "Error casting DataWriter 3 to typed DataWriter 3\n")); + throw ::CORBA::INTERNAL (); + } } else { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 3 to typed DataWriter 3\n")); + ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " + "Error getting DDS DataWriter 3.\n")); throw ::CORBA::INTERNAL (); } } diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h index 341c942af15..3229ce1a259 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h @@ -15,9 +15,6 @@ #include "tao/LocalObject.h" -class SharedDPTest1DataWriter; -class SharedDPTest2DataWriter; -class SharedDPTest3DataWriter; class DDSDomainParticipant; namespace CIAO_SharedDP_SharedDPComponent_Impl @@ -41,10 +38,6 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl private: ::SharedDP::CCM_SharedDPComponent_Context_var context_; - SharedDPTest1DataWriter * writer1_; - SharedDPTest2DataWriter * writer2_; - SharedDPTest3DataWriter * writer3_; - DDSDomainParticipant * dds_dp1_; DDSDomainParticipant * dds_dp2_; DDSDomainParticipant * dds_dp3_; diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp index 97f1875f78c..770c04ceb05 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp @@ -65,7 +65,7 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl void Component_exec_i::ccm_activate (void) { - typedef ::CIAO::NDDS::DDS_DataWriter_Base DataWriter_type; + typedef ::CIAO::NDDS::DDS_DataWriter_Base DataWriter_type; try { ::DDS::DataWriter_var dw1 = @@ -82,22 +82,32 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl if (ccm_dw1) { - DataWriter_type * typed_ccm_dw = - dynamic_cast <DataWriter_type *> (ccm_dw1->get_dds_entity ()); - if (typed_ccm_dw) + ::DDS::DataWriter_var tmp = ccm_dw1->get_dds_entity (); + if (! ::CORBA::is_nil (tmp.in ())) { - DDSDataWriter * dds_dw1 = typed_ccm_dw->get_rti_entity (); - DDSPublisher * dds_p1 = dds_dw1->get_publisher (); - this->dds_dp1_ = dds_p1->get_participant (); - - DDSTopicDescription * td1 = - this->dds_dp1_->lookup_topicdescription (tp_name_conn_1_); - this->dds_tp1_ = DDSTopic::narrow (td1); + DataWriter_type * typed_ccm_dw = + dynamic_cast <DataWriter_type *> (tmp.in ()); + if (typed_ccm_dw) + { + DDSDataWriter * dds_dw1 = typed_ccm_dw->get_rti_entity (); + DDSPublisher * dds_p1 = dds_dw1->get_publisher (); + this->dds_dp1_ = dds_p1->get_participant (); + + DDSTopicDescription * td1 = + this->dds_dp1_->lookup_topicdescription (tp_name_conn_1_); + this->dds_tp1_ = DDSTopic::narrow (td1); + } + else + { + ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " + "Error casting DataWriter 1 to typed DataWriter 1\n")); + throw ::CORBA::INTERNAL (); + } } else { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 1 to typed DataWriter 1\n")); + ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " + "Error getting DDS DataWriter 1.\n")); throw ::CORBA::INTERNAL (); } } @@ -129,22 +139,32 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl if (ccm_dw2) { - DataWriter_type * typed_ccm_dw = - dynamic_cast <DataWriter_type *> (ccm_dw2->get_dds_entity ()); - if (typed_ccm_dw) + ::DDS::DataWriter_var tmp = ccm_dw2->get_dds_entity (); + if (! ::CORBA::is_nil (tmp.in ())) { - DDSDataWriter * dds_dw2 = typed_ccm_dw->get_rti_entity (); - DDSPublisher * dds_p2 = dds_dw2->get_publisher (); - this->dds_dp2_ = dds_p2->get_participant (); - - DDSTopicDescription * td2 = - this->dds_dp2_->lookup_topicdescription (tp_name_conn_2_); - this->dds_tp2_ = DDSTopic::narrow (td2); + DataWriter_type * typed_ccm_dw = + dynamic_cast <DataWriter_type *> (tmp.in ()); + if (typed_ccm_dw) + { + DDSDataWriter * dds_dw2 = typed_ccm_dw->get_rti_entity (); + DDSPublisher * dds_p2 = dds_dw2->get_publisher (); + this->dds_dp2_ = dds_p2->get_participant (); + + DDSTopicDescription * td2 = + this->dds_dp2_->lookup_topicdescription (tp_name_conn_2_); + this->dds_tp2_ = DDSTopic::narrow (td2); + } + else + { + ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " + "Error casting DataWriter 2 to typed DataWriter 2\n")); + throw ::CORBA::INTERNAL (); + } } else { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 2 to typed DataWriter 2\n")); + ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " + "Error getting DDS DataWriter 2.\n")); throw ::CORBA::INTERNAL (); } } @@ -177,22 +197,32 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl if (ccm_dw3) { - DataWriter_type * typed_ccm_dw = - dynamic_cast <DataWriter_type *> (ccm_dw3->get_dds_entity ()); - if (typed_ccm_dw) + ::DDS::DataWriter_var tmp = ccm_dw3->get_dds_entity (); + if (! ::CORBA::is_nil (tmp.in ())) { - DDSDataWriter * dds_dw3 = typed_ccm_dw->get_rti_entity (); - DDSPublisher * dds_p3 = dds_dw3->get_publisher (); - this->dds_dp3_ = dds_p3->get_participant (); - - DDSTopicDescription * td3 = - this->dds_dp3_->lookup_topicdescription (tp_name_conn_3_); - this->dds_tp3_ = DDSTopic::narrow (td3); + DataWriter_type * typed_ccm_dw = + dynamic_cast <DataWriter_type *> (tmp.in ()); + if (typed_ccm_dw) + { + DDSDataWriter * dds_dw3 = typed_ccm_dw->get_rti_entity (); + DDSPublisher * dds_p3 = dds_dw3->get_publisher (); + this->dds_dp3_ = dds_p3->get_participant (); + + DDSTopicDescription * td3 = + this->dds_dp3_->lookup_topicdescription (tp_name_conn_3_); + this->dds_tp3_ = DDSTopic::narrow (td3); + } + else + { + ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " + "Error casting DataWriter 3 to typed DataWriter 3\n")); + throw ::CORBA::INTERNAL (); + } } else { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 3 to typed DataWriter 3\n")); + ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " + "Error getting DDS DataWriter 3.\n")); throw ::CORBA::INTERNAL (); } } @@ -224,22 +254,32 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl if (ccm_dw4) { - DataWriter_type * typed_ccm_dw = - dynamic_cast <DataWriter_type *> (ccm_dw4->get_dds_entity ()); - if (typed_ccm_dw) + ::DDS::DataWriter_var tmp = ccm_dw4->get_dds_entity (); + if (! ::CORBA::is_nil (tmp.in ())) { - DDSDataWriter * dds_dw4 = typed_ccm_dw->get_rti_entity (); - DDSPublisher * dds_p4 = dds_dw4->get_publisher (); - this->dds_dp4_ = dds_p4->get_participant (); - - DDSTopicDescription * td4 = - this->dds_dp4_->lookup_topicdescription (tp_name_conn_4_); - this->dds_tp4_ = DDSTopic::narrow (td4); + DataWriter_type * typed_ccm_dw = + dynamic_cast <DataWriter_type *> (tmp.in ()); + if (typed_ccm_dw) + { + DDSDataWriter * dds_dw4 = typed_ccm_dw->get_rti_entity (); + DDSPublisher * dds_p4 = dds_dw4->get_publisher (); + this->dds_dp4_ = dds_p4->get_participant (); + + DDSTopicDescription * td4 = + this->dds_dp4_->lookup_topicdescription (tp_name_conn_4_); + this->dds_tp4_ = DDSTopic::narrow (td4); + } + else + { + ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " + "Error casting DataWriter 4 to typed DataWriter 4\n")); + throw ::CORBA::INTERNAL (); + } } else { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 4 to typed DataWriter 4\n")); + ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " + "Error getting DDS DataWriter 4.\n")); throw ::CORBA::INTERNAL (); } } diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h index 69f397a4dfb..d183b70b769 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h @@ -15,10 +15,6 @@ #include "tao/LocalObject.h" -class SharedDPTest1DataWriter; -class SharedDPTest2DataWriter; -class SharedDPTest3DataWriter; -class SharedDPTest4DataWriter; class DDSDomainParticipant; class DDSTopic; @@ -48,11 +44,6 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl CORBA::Boolean perform_test_; - SharedDPTest1DataWriter * writer1_; - SharedDPTest2DataWriter * writer2_; - SharedDPTest3DataWriter * writer3_; - SharedDPTest4DataWriter * writer4_; - DDSDomainParticipant * dds_dp1_; DDSDomainParticipant * dds_dp2_; DDSDomainParticipant * dds_dp3_; diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h index 478c25688d1..611e730abea 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h @@ -57,7 +57,7 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::Unkeyed_Test::UnkeyedTestConnector::Listener. */ + /** Operations and attributes from Unkeyed_Test::UnkeyedTestConnector::Listener. */ virtual void on_one_data (const ::UnkeyedTest & datum, @@ -87,7 +87,7 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -116,7 +116,7 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl virtual ~info_out_connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h index f8df546b588..2e4cc35c347 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h @@ -58,7 +58,7 @@ namespace CIAO_Writer_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::Writer::WriterTestConnector::Listener. */ + /** Operations and attributes from Writer::WriterTestConnector::Listener. */ virtual void on_one_data (const ::WriterTest & datum, @@ -90,7 +90,7 @@ namespace CIAO_Writer_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h index 25869974cde..7259e43f5d9 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h @@ -59,7 +59,7 @@ namespace CIAO_Updater_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::Updater::UpdaterConnector::Listener. */ + /** Operations and attributes from Updater::UpdaterConnector::Listener. */ virtual void on_one_data (const ::TestTopic & datum, @@ -89,7 +89,7 @@ namespace CIAO_Updater_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h index 1fa320fef30..1c5212225a9 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h @@ -35,7 +35,7 @@ namespace CIAO_Shapes_Receiver_comp_Impl ::Shapes::CCM_Receiver_comp_Context_ptr ctx); virtual ~info_out_data_listener_exec_i (void); - // Operations and attributes from ::Shapes::ShapeType_conn::Listener + // Operations and attributes from Shapes::ShapeType_conn::Listener virtual void on_one_data (const ::ShapeType & datum, @@ -62,7 +62,7 @@ namespace CIAO_Shapes_Receiver_comp_Impl ::Shapes::CCM_Receiver_comp_Context_ptr ctx); virtual ~info_out_status_exec_i (void); - // Operations and attributes from ::CCM_DDS::PortStatusListener + // Operations and attributes from CCM_DDS::PortStatusListener virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h index 7dc6bfa3b17..143badd636c 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h @@ -33,7 +33,7 @@ namespace CIAO_Shapes_Sender_comp_Impl Sender_comp_exec_i &callback); virtual ~control_exec_i (void); - // Operations and attributes from ::Shapes::Control_obj + // Operations and attributes from Shapes::Control_obj virtual ::Shapes::ReturnStatus setSize (::CORBA::UShort size); diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h index 6e9caa253ee..86fe5495782 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h @@ -53,7 +53,7 @@ namespace CIAO_Shapes_Receiver_comp_Impl ::Shapes::CCM_Receiver_comp_Context_ptr ctx); virtual ~info_out_data_listener_exec_i (void); - // Operations and attributes from ::Shapes::ShapeType_conn::Listener + // Operations and attributes from Shapes::ShapeType_conn::Listener virtual void on_one_data (const ::ShapeType & datum, @@ -80,7 +80,7 @@ namespace CIAO_Shapes_Receiver_comp_Impl ::Shapes::CCM_Receiver_comp_Context_ptr ctx); virtual ~info_out_status_exec_i (void); - // Operations and attributes from ::CCM_DDS::PortStatusListener + // Operations and attributes from CCM_DDS::PortStatusListener virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h index 6669e6b9659..72a57ceb32a 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h @@ -53,7 +53,7 @@ namespace CIAO_Shapes_Sender_comp_Impl ::Shapes::CCM_Sender_comp_Context_ptr ctx); virtual ~control_exec_i (void); - // Operations and attributes from ::Shapes::Control_obj + // Operations and attributes from Shapes::Control_obj virtual ::Shapes::ReturnStatus setSize (::CORBA::UShort size); |