diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-02-24 11:27:26 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-02-24 11:27:26 +0000 |
| commit | 040be796861afc17fbdff29382d8ca70f6291ad0 (patch) | |
| tree | 9f491735e306540173ae8642d1a7fced37924afd | |
| parent | 0d2c3331b177745e1f5bacc1529cc2a84dbc2366 (diff) | |
| download | ATCD-040be796861afc17fbdff29382d8ca70f6291ad0.tar.gz | |
Wed Feb 24 11:26:52 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp
* connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h
* connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp
* connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h
* connectors/dds4ccm/impl/ndds/DataReader.cpp
* connectors/dds4ccm/impl/ndds/DataReader.h
* connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp
* connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h
* connectors/dds4ccm/impl/ndds/DataReaderListener.cpp
* connectors/dds4ccm/impl/ndds/DataReaderListener.h
* connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp
* connectors/dds4ccm/impl/ndds/DataReaderListener_T.h
* connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp
* connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h
* connectors/dds4ccm/impl/ndds/DataWriter.cpp
* connectors/dds4ccm/impl/ndds/DataWriter.h
* connectors/dds4ccm/impl/ndds/DataWriterListener.cpp
* connectors/dds4ccm/impl/ndds/DataWriterListener.h
* connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp
* connectors/dds4ccm/impl/ndds/DDS_Get_T.h
* connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp
* connectors/dds4ccm/impl/ndds/DDS_Listen_T.h
* connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp
* connectors/dds4ccm/impl/ndds/DDS_Read_T.h
* connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp
* connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h
* connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp
* connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp
* connectors/dds4ccm/impl/ndds/DDS_Update_T.h
* connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp
* connectors/dds4ccm/impl/ndds/DDS_Write_T.h
* connectors/dds4ccm/impl/ndds/DomainParticipant.cpp
* connectors/dds4ccm/impl/ndds/DomainParticipant.h
* connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp
* connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h
* connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp
* connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
* connectors/dds4ccm/impl/ndds/Getter_T.cpp
* connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp
* connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h
* connectors/dds4ccm/impl/ndds/Publisher.cpp
* connectors/dds4ccm/impl/ndds/Publisher.h
* connectors/dds4ccm/impl/ndds/PublisherListener.cpp
* connectors/dds4ccm/impl/ndds/PublisherListener.h
* connectors/dds4ccm/impl/ndds/QueryCondition.cpp
* connectors/dds4ccm/impl/ndds/QueryCondition.h
* connectors/dds4ccm/impl/ndds/ReadCondition.cpp
* connectors/dds4ccm/impl/ndds/ReadCondition.h
* connectors/dds4ccm/impl/ndds/Reader_T.cpp
* connectors/dds4ccm/impl/ndds/Subscriber.cpp
* connectors/dds4ccm/impl/ndds/Subscriber.h
* connectors/dds4ccm/impl/ndds/SubscriberListener.cpp
* connectors/dds4ccm/impl/ndds/SubscriberListener.h
* connectors/dds4ccm/impl/ndds/Topic.cpp
* connectors/dds4ccm/impl/ndds/TopicDescription.cpp
* connectors/dds4ccm/impl/ndds/Updater_T.cpp
* connectors/dds4ccm/impl/ndds/Updater_T.h
* connectors/dds4ccm/impl/ndds/Writer_T.cpp
* connectors/dds4ccm/impl/ndds/Writer_T.h
Cleaning up the implementation
60 files changed, 4152 insertions, 4204 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 10202eda52a..777d5ebe439 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,66 @@ +Wed Feb 24 11:26:52 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp + * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h + * connectors/dds4ccm/impl/ndds/DataReader.cpp + * connectors/dds4ccm/impl/ndds/DataReader.h + * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h + * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp + * connectors/dds4ccm/impl/ndds/DataReaderListener.h + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h + * connectors/dds4ccm/impl/ndds/DataWriter.cpp + * connectors/dds4ccm/impl/ndds/DataWriter.h + * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp + * connectors/dds4ccm/impl/ndds/DataWriterListener.h + * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Get_T.h + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h + * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Read_T.h + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Update_T.h + * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Write_T.h + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipant.h + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h + * connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h + * connectors/dds4ccm/impl/ndds/Getter_T.cpp + * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp + * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h + * connectors/dds4ccm/impl/ndds/Publisher.cpp + * connectors/dds4ccm/impl/ndds/Publisher.h + * connectors/dds4ccm/impl/ndds/PublisherListener.cpp + * connectors/dds4ccm/impl/ndds/PublisherListener.h + * connectors/dds4ccm/impl/ndds/QueryCondition.cpp + * connectors/dds4ccm/impl/ndds/QueryCondition.h + * connectors/dds4ccm/impl/ndds/ReadCondition.cpp + * connectors/dds4ccm/impl/ndds/ReadCondition.h + * connectors/dds4ccm/impl/ndds/Reader_T.cpp + * connectors/dds4ccm/impl/ndds/Subscriber.cpp + * connectors/dds4ccm/impl/ndds/Subscriber.h + * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp + * connectors/dds4ccm/impl/ndds/SubscriberListener.h + * connectors/dds4ccm/impl/ndds/Topic.cpp + * connectors/dds4ccm/impl/ndds/TopicDescription.cpp + * connectors/dds4ccm/impl/ndds/Updater_T.cpp + * connectors/dds4ccm/impl/ndds/Updater_T.h + * connectors/dds4ccm/impl/ndds/Writer_T.cpp + * connectors/dds4ccm/impl/ndds/Writer_T.h + Cleaning up the implementation + Wed Feb 24 10:45:52 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp index 93aef94fe30..9fd0fd752f2 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp @@ -1,7 +1,7 @@ // $Id$ #include "dds4ccm/impl/ndds/Coherent_Changes_Guard.h" -CIAO::DDS4CCM::RTI::Coherent_Changes_Guard::Coherent_Changes_Guard (DDSPublisher* p, bool coherent_write) : p_ (p), coherent_write_ (coherent_write) +CIAO::DDS4CCM::Coherent_Changes_Guard::Coherent_Changes_Guard (DDSPublisher* p, bool coherent_write) : p_ (p), coherent_write_ (coherent_write) { if (this->coherent_write_) { @@ -9,7 +9,7 @@ CIAO::DDS4CCM::RTI::Coherent_Changes_Guard::Coherent_Changes_Guard (DDSPublisher } } -CIAO::DDS4CCM::RTI::Coherent_Changes_Guard::~Coherent_Changes_Guard () +CIAO::DDS4CCM::Coherent_Changes_Guard::~Coherent_Changes_Guard () { if (this->coherent_write_) { diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h index 3823a6a797c..8a02245aed1 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h @@ -26,19 +26,16 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + class DDS4CCM_NDDS_IMPL_Export Coherent_Changes_Guard : + private ACE_Copy_Disabled { - class DDS4CCM_NDDS_IMPL_Export Coherent_Changes_Guard : - private ACE_Copy_Disabled - { - public: - Coherent_Changes_Guard (::DDSPublisher* p, bool coherent_write); - ~Coherent_Changes_Guard (); - private: - ::DDSPublisher* p_; - bool const coherent_write_; - }; - } + public: + Coherent_Changes_Guard (::DDSPublisher* p, bool coherent_write); + ~Coherent_Changes_Guard (); + private: + ::DDSPublisher* p_; + bool const coherent_write_; + }; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp index ef389fc0620..244d1687065 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp @@ -10,134 +10,131 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + CCM_DDS_ContentFilteredTopic_i::CCM_DDS_ContentFilteredTopic_i ( + DDSContentFilteredTopic * dw) : impl_ (dw) { - RTI_ContentFilteredTopic_i::RTI_ContentFilteredTopic_i (void) - : impl_ (0) - { - } - - RTI_ContentFilteredTopic_i::~RTI_ContentFilteredTopic_i (void) - { - } - - char * - RTI_ContentFilteredTopic_i::get_filter_expression (void) - { - DDS4CCM_TRACE ("RTI_ContentFilteredTopic_i::get_filter_expression"); - return CORBA::string_dup (this->impl ()->get_filter_expression ()); - } - - ::DDS::ReturnCode_t - RTI_ContentFilteredTopic_i::get_expression_parameters ( - ::DDS::StringSeq & expression_parameters) - { - DDS4CCM_TRACE ("RTI_ContentFilteredTopic_i::get_expression_parameters"); + } + + CCM_DDS_ContentFilteredTopic_i::~CCM_DDS_ContentFilteredTopic_i (void) + { + } + + char * + CCM_DDS_ContentFilteredTopic_i::get_filter_expression (void) + { + DDS4CCM_TRACE ("CCM_DDS_ContentFilteredTopic_i::get_filter_expression"); + return CORBA::string_dup (this->impl ()->get_filter_expression ()); + } + + ::DDS::ReturnCode_t + CCM_DDS_ContentFilteredTopic_i::get_expression_parameters ( + ::DDS::StringSeq & expression_parameters) + { + DDS4CCM_TRACE ("CCM_DDS_ContentFilteredTopic_i::get_expression_parameters"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_StringSeq parameters; - ::DDS::ReturnCode_t retval = this->impl ()->get_expression_parameters ( - parameters); - expression_parameters <<= parameters; + DDS_StringSeq parameters; + ::DDS::ReturnCode_t retval = this->impl ()->get_expression_parameters ( + parameters); + expression_parameters <<= parameters; #else - ::DDS::ReturnCode_t retval = this->impl ()->get_expression_parameters ( - expression_parameters); + ::DDS::ReturnCode_t retval = this->impl ()->get_expression_parameters ( + expression_parameters); #endif - return retval; - } + return retval; + } - ::DDS::ReturnCode_t - RTI_ContentFilteredTopic_i::set_expression_parameters ( - const ::DDS::StringSeq & expression_parameters) - { - DDS4CCM_TRACE ("RTI_ContentFilteredTopic_i::set_expression_parameters"); + ::DDS::ReturnCode_t + CCM_DDS_ContentFilteredTopic_i::set_expression_parameters ( + const ::DDS::StringSeq & expression_parameters) + { + DDS4CCM_TRACE ("CCM_DDS_ContentFilteredTopic_i::set_expression_parameters"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_StringSeq parameters; - parameters <<= expression_parameters; - return this->impl ()->set_expression_parameters (parameters); + DDS_StringSeq parameters; + parameters <<= expression_parameters; + return this->impl ()->set_expression_parameters (parameters); #else - return this->impl ()->set_expression_parameters (expression_parameters); + return this->impl ()->set_expression_parameters (expression_parameters); #endif - } + } - ::DDS::Topic_ptr - RTI_ContentFilteredTopic_i::get_related_topic (void) - { - DDS4CCM_TRACE ("RTI_ContentFilteredTopic_i::get_related_topic"); + ::DDS::Topic_ptr + CCM_DDS_ContentFilteredTopic_i::get_related_topic (void) + { + DDS4CCM_TRACE ("CCM_DDS_ContentFilteredTopic_i::get_related_topic"); - ::DDS::Topic_var retval = ::DDS::Topic::_nil (); + ::DDS::Topic_var retval = ::DDS::Topic::_nil (); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSTopic *topic = this->impl ()->get_related_topic (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_Topic_i (topic), - CORBA::NO_MEMORY ()); - return retval._retn (); + DDSTopic *topic = this->impl ()->get_related_topic (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_Topic_i (topic), + CORBA::NO_MEMORY ()); + return retval._retn (); #else - ::DDS::Topic_var topic = this->impl ()->get_related_topic (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_Topic_i (topic.in ()), - CORBA::NO_MEMORY ()); - return retval._retn (); + ::DDS::Topic_var topic = this->impl ()->get_related_topic (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_Topic_i (topic.in ()), + CORBA::NO_MEMORY ()); + return retval._retn (); #endif - } + } - char * - RTI_ContentFilteredTopic_i::get_type_name (void) - { + char * + CCM_DDS_ContentFilteredTopic_i::get_type_name (void) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - return CORBA::string_dup (this->impl ()->get_type_name ()); + return CORBA::string_dup (this->impl ()->get_type_name ()); #else #endif - } + } - char * - RTI_ContentFilteredTopic_i::get_name (void) - { + char * + CCM_DDS_ContentFilteredTopic_i::get_name (void) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - return CORBA::string_dup (this->impl ()->get_name ()); + return CORBA::string_dup (this->impl ()->get_name ()); #else #endif - } + } - ::DDS::DomainParticipant_ptr - RTI_ContentFilteredTopic_i::get_participant (void) - { + ::DDS::DomainParticipant_ptr + CCM_DDS_ContentFilteredTopic_i::get_participant (void) + { + ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); - ACE_NEW_THROW_EX (retval, - RTI_DomainParticipant_i (), - CORBA::NO_MEMORY ()); - - DDSDomainParticipant* p = this->impl ()->get_participant (); - RTI_DomainParticipant_i *rti_dp = dynamic_cast < RTI_DomainParticipant_i *> (retval.in ()); - rti_dp->set_impl (p); - return retval._retn (); + DDSDomainParticipant* p = this->impl ()->get_participant (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (p), + CORBA::NO_MEMORY ()); #else + ::DDS::DomainParticipant_var p = this->impl ()->get_participant (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (p.in ()), + CORBA::NO_MEMORY ()); #endif - } - - DDSContentFilteredTopic * - RTI_ContentFilteredTopic_i::get_impl (void) - { - return this->impl_; - } - - void - RTI_ContentFilteredTopic_i::set_impl (DDSContentFilteredTopic * dw) - { - this->impl_ = dw; - } - - DDSContentFilteredTopic * - RTI_ContentFilteredTopic_i::impl (void) - { - if (!this->impl_) - { - throw ::CORBA::BAD_INV_ORDER (); - } - return this->impl_; - } + return retval._retn (); + } + DDSContentFilteredTopic * + CCM_DDS_ContentFilteredTopic_i::get_impl (void) + { + return this->impl_; + } + + void + CCM_DDS_ContentFilteredTopic_i::set_impl (DDSContentFilteredTopic * dw) + { + this->impl_ = dw; + } + + DDSContentFilteredTopic * + CCM_DDS_ContentFilteredTopic_i::impl (void) + { + if (!this->impl_) + { + throw ::CORBA::BAD_INV_ORDER (); + } + return this->impl_; } } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h index 5211f501100..13208ca50e4 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h @@ -23,52 +23,48 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_ContentFilteredTopic_i : + public virtual ::DDS::CCM_ContentFilteredTopic, + public virtual ::CORBA::LocalObject { - class DDS4CCM_NDDS_IMPL_Export RTI_ContentFilteredTopic_i : - public virtual ::DDS::CCM_ContentFilteredTopic, - public virtual ::CORBA::LocalObject - { - public: - // Constructor - RTI_ContentFilteredTopic_i (void); + public: + /// Constructor + CCM_DDS_ContentFilteredTopic_i (DDSContentFilteredTopic * dw); - // Destructor - virtual ~RTI_ContentFilteredTopic_i (void); + /// Destructor + virtual ~CCM_DDS_ContentFilteredTopic_i (void); - virtual - char * get_filter_expression (void); + virtual char * get_filter_expression (void); - virtual - ::DDS::ReturnCode_t get_expression_parameters ( - ::DDS::StringSeq & expression_parameters); + virtual + ::DDS::ReturnCode_t get_expression_parameters ( + ::DDS::StringSeq & expression_parameters); - virtual - ::DDS::ReturnCode_t set_expression_parameters ( - const ::DDS::StringSeq & expression_parameters); + virtual + ::DDS::ReturnCode_t set_expression_parameters ( + const ::DDS::StringSeq & expression_parameters); - virtual - ::DDS::Topic_ptr get_related_topic (void); + virtual + ::DDS::Topic_ptr get_related_topic (void); - virtual - char * get_type_name (void); + virtual + char * get_type_name (void); - virtual - char * get_name (void); + virtual + char * get_name (void); - virtual - ::DDS::DomainParticipant_ptr get_participant (void); + virtual + ::DDS::DomainParticipant_ptr get_participant (void); - DDSContentFilteredTopic * get_impl (void); + DDSContentFilteredTopic * get_impl (void); - void set_impl (DDSContentFilteredTopic * dw); + void set_impl (DDSContentFilteredTopic * dw); - private: - DDSContentFilteredTopic * impl_; + private: + DDSContentFilteredTopic * impl_; - DDSContentFilteredTopic * impl (void); - }; - } + DDSContentFilteredTopic * impl (void); + }; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp index 7427dacd16e..1840a778c4f 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp @@ -51,8 +51,8 @@ DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::configuration_complete ( ::DDS::DataReaderListener::_nil (), 0); } - ::CIAO::DDS4CCM::RTI::RTI_DataReader_i *rd = - dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DataReader_i *> (reader.in ()); + ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *rd = + dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *> (reader.in ()); this->rti_reader_.set_impl (rd->get_impl ()); this->data_reader_ = ::DDS::CCM_DataReader::_narrow (reader); this->dds_get_.set_impl (reader); diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.h index 1e60f2edf80..9c19c852365 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.h @@ -54,7 +54,7 @@ private: ::DDS::DataReaderListener_var status_; ::CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE, FIXED> dds_get_; ::CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE> dds_read_; - ::CIAO::DDS4CCM::RTI::RTI_DataReader_i rti_reader_; + ::CIAO::DDS4CCM::CCM_DDS_DataReader_i rti_reader_; //@} typedef ::CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE> PortStatusListener; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp index 2fa670dd18f..cb153a316ea 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp @@ -58,8 +58,8 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE>::configuration_complete ( ::DDS::DataReaderListener::_nil (), 0); } - ::CIAO::DDS4CCM::RTI::RTI_DataReader_i *rd = - dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DataReader_i *> (reader.in ()); + ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *rd = + dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *> (reader.in ()); this->rti_reader_.set_impl (rd->get_impl ()); this->data_reader_ = ::DDS::CCM_DataReader::_narrow (reader); this->dds_read_.set_impl (this->data_reader_.in ()); @@ -95,7 +95,7 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE>::activate ( } this->rti_reader_.set_listener ( this->data_listener_.in (), - ::CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::get_mask ( + ::CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::get_mask ( listener)); } catch (...) diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.h index 14a1e94b006..ad10499763d 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.h @@ -54,9 +54,9 @@ private: ::CCM_DDS::CCM_DataListenerControl_var data_control_; ::DDS::DataReaderListener_var data_listener_; ::CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE> dds_read_; - ::CIAO::DDS4CCM::RTI::RTI_DataReader_i rti_reader_; + ::CIAO::DDS4CCM::CCM_DDS_DataReader_i rti_reader_; //@} - typedef ::CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE> DataReaderListener; + typedef ::CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE> DataReaderListener; }; #include "dds4ccm/impl/ndds/DDS_Listen_T.cpp" diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp index 16e7d7b2514..59ee6a0fa7b 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp @@ -53,8 +53,8 @@ DDS_Read_T<DDS_TYPE, CCM_TYPE>::configuration_complete ( ::DDS::DataReaderListener::_nil (), 0); } - ::CIAO::DDS4CCM::RTI::RTI_DataReader_i *rd = - dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DataReader_i *> (reader.in ()); + ::CIAO::DDS4CCM::RTI::CCM_DDS_DataReader_i *rd = + dynamic_cast < ::CIAO::DDS4CCM::RTI::CCM_DDS_DataReader_i *> (reader.in ()); this->rti_reader_.set_impl (rd->get_impl ()); this->data_ = ::DDS::CCM_DataReader::_narrow (reader); this->dds_read_.set_impl (reader); diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.h index 125ec02cf00..54ce6b30926 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.h @@ -50,7 +50,7 @@ private: ::DDS::CCM_DataReader_var data_; ::DDS::DataReaderListener_var status_; ::CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE> dds_read_; - ::CIAO::DDS4CCM::RTI::RTI_DataReader_i rti_reader_; + ::CIAO::DDS4CCM::CCM_DDS_DataReader_i rti_reader_; //@} typedef ::CIAO::DDS4CCM::PortStatusListener_T <DDS_TYPE, CCM_TYPE> PortStatusListener; }; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp index 317c3098cdf..b9a2762a683 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp @@ -53,8 +53,8 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::configuration_complete ( ::DDS::DataReaderListener::_nil (), 0); } - ::CIAO::DDS4CCM::RTI::RTI_DataReader_i *rd = - dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DataReader_i *> (reader.in ()); + ::CIAO::DDS4CCM::RTI::CCM_DDS_DataReader_i *rd = + dynamic_cast < ::CIAO::DDS4CCM::RTI::CCM_DDS_DataReader_i *> (reader.in ()); this->rti_reader_.set_impl (rd->get_impl ()); this->data_reader_ = ::DDS::CCM_DataReader::_narrow (reader); this->dds_read_.set_impl (this->data_reader_.in ()); diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h index 66680c233c6..2692ccd3bf5 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h @@ -53,9 +53,9 @@ private: ::CCM_DDS::CCM_StateListenerControl_var data_control_; ::DDS::DataReaderListener_var data_listener_; ::CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE> dds_read_; - ::CIAO::DDS4CCM::RTI::RTI_DataReader_i rti_reader_; + ::CIAO::DDS4CCM::CCM_DDS_DataReader_i rti_reader_; //@} - typedef ::CIAO::DDS4CCM::RTI::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE> DataReaderStateListener; + typedef ::CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE> DataReaderStateListener; }; #include "dds4ccm/impl/ndds/DDS_StateListen_T.cpp" diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp index e8bceb1dba4..5fb5b21411d 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp @@ -144,8 +144,8 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::init_default_topic (void) { try { - CIAO::DDS4CCM::RTI::RTI_DomainParticipant_i *part = - dynamic_cast< CIAO::DDS4CCM::RTI::RTI_DomainParticipant_i * > ( + CIAO::DDS4CCM::CCM_DDS_DomainParticipant_i *part = + dynamic_cast< CIAO::DDS4CCM::CCM_DDS_DomainParticipant_i * > ( this->domain_participant_.in ()); DDS_ReturnCode_t const retcode = DDS_TYPE::type_support::register_type( part->get_impl (), DDS_TYPE::type_support::get_type_name ()); diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp index a93e9beae61..1072db1b5d4 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp @@ -50,8 +50,8 @@ DDS_Update_T<DDS_TYPE, CCM_TYPE>::configuration_complete ( ::DDS::DataWriterListener::_nil (), 0); } - ::CIAO::DDS4CCM::RTI::RTI_DataWriter_i *rw = - dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DataWriter_i *> (dwv_tmp.in ()); + ::CIAO::DDS4CCM::RTI::CCM_DDS_DataWriter_i *rw = + dynamic_cast < ::CIAO::DDS4CCM::RTI::CCM_DDS_DataWriter_i *> (dwv_tmp.in ()); this->rti_writer_.set_impl (rw->get_impl ()); this->data_writer_ = ::DDS::CCM_DataWriter::_narrow (dwv_tmp); this->dds_update_.set_impl (dwv_tmp); diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.h index 725754c9aa0..0aa579e9446 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.h @@ -41,8 +41,8 @@ private: //@{ ::DDS::CCM_DataWriter_var data_writer_; ::DDS::DataWriterListener_var data_listener_; - ::CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE> dds_update_; - ::CIAO::DDS4CCM::RTI::RTI_DataWriter_i rti_writer_; + ::CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE> dds_update_; + ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i rti_writer_; //@} typedef ::CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE> DataWriterListener; }; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp index ddeb171a50f..a29bbbe6930 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp @@ -51,8 +51,8 @@ DDS_Write_T<DDS_TYPE, CCM_TYPE>::configuration_complete ( ::DDS::DataWriterListener::_nil (), 0); } - ::CIAO::DDS4CCM::RTI::RTI_DataWriter_i *rw = - dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DataWriter_i *> (dwv_tmp.in ()); + ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rw = + dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dwv_tmp.in ()); this->rti_writer_.set_impl (rw->get_impl ()); this->data_writer_ = ::DDS::CCM_DataWriter::_narrow (dwv_tmp); this->writer_t_.set_impl (dwv_tmp); diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.h index e9fe904143f..41581d938f1 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.h @@ -48,8 +48,8 @@ private: //@{ ::DDS::CCM_DataWriter_var data_writer_; ::DDS::DataWriterListener_var data_listener_; - ::CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE> writer_t_; - ::CIAO::DDS4CCM::RTI::RTI_DataWriter_i rti_writer_; + ::CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE> writer_t_; + ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i rti_writer_; //@} typedef ::CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE> DataWriterListener; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp index 306d7d38a29..d7eb807ca43 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp @@ -25,392 +25,388 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + CCM_DDS_DataReader_i::CCM_DDS_DataReader_i (void) + : impl_ (0) { - RTI_DataReader_i::RTI_DataReader_i (void) - : impl_ (0) - { - } - - RTI_DataReader_i::~RTI_DataReader_i (void) - { - } - - ::DDS::ReturnCode_t - RTI_DataReader_i::enable (void) - { - return this->impl ()->enable (); - } - - ::DDS::StatusCondition_ptr - RTI_DataReader_i::get_statuscondition (void) - { - ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); + } + + CCM_DDS_DataReader_i::~CCM_DDS_DataReader_i (void) + { + } + + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::enable (void) + { + return this->impl ()->enable (); + } + + ::DDS::StatusCondition_ptr + CCM_DDS_DataReader_i::get_statuscondition (void) + { + ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSStatusCondition* sc = this->impl ()->get_statuscondition (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc), - CORBA::NO_MEMORY ()); + DDSStatusCondition* sc = this->impl ()->get_statuscondition (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc), + CORBA::NO_MEMORY ()); #else - ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc.in ()), - CORBA::NO_MEMORY ()); + ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc.in ()), + CORBA::NO_MEMORY ()); #endif - return retval._retn (); - } - - ::DDS::StatusMask - RTI_DataReader_i::get_status_changes (void) - { - return this->impl ()->get_status_changes (); - } - - DDS_INSTANCE_HANDLE_T_RETN - RTI_DataReader_i::get_instance_handle (void) - { + return retval._retn (); + } + + ::DDS::StatusMask + CCM_DDS_DataReader_i::get_status_changes (void) + { + return this->impl ()->get_status_changes (); + } + + DDS_INSTANCE_HANDLE_T_RETN + CCM_DDS_DataReader_i::get_instance_handle (void) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); - ::DDS::InstanceHandle_t handle; - handle <<= rtihandle; - return handle; + ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); + ::DDS::InstanceHandle_t handle; + handle <<= rtihandle; + return handle; #else - return this->impl ()->get_instance_handle (); + return this->impl ()->get_instance_handle (); #endif - } - - ::DDS::ReadCondition_ptr - RTI_DataReader_i::create_readcondition ( - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states) - { + } + + ::DDS::ReadCondition_ptr + CCM_DDS_DataReader_i::create_readcondition ( + ::DDS::SampleStateMask sample_states, + ::DDS::ViewStateMask view_states, + ::DDS::InstanceStateMask instance_states) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::ReadCondition_var retval = ::DDS::ReadCondition::_nil (); - ACE_NEW_THROW_EX (retval, - RTI_ReadCondition_i (), - CORBA::NO_MEMORY ()); - - DDSReadCondition* rc = this->impl ()->create_readcondition (sample_states, view_states, instance_states); - RTI_ReadCondition_i *rti_rc = dynamic_cast < RTI_ReadCondition_i *>(retval.in ()); - rti_rc->set_impl (rc); - return retval._retn (); + ::DDS::ReadCondition_var retval = ::DDS::ReadCondition::_nil (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_ReadCondition_i (), + CORBA::NO_MEMORY ()); + + DDSReadCondition* rc = this->impl ()->create_readcondition (sample_states, view_states, instance_states); + CCM_DDS_ReadCondition_i *rti_rc = dynamic_cast < CCM_DDS_ReadCondition_i *>(retval.in ()); + rti_rc->set_impl (rc); + return retval._retn (); #else - return this->impl ()->create_readcondition (sample_states, view_states, instance_states); + return this->impl ()->create_readcondition (sample_states, view_states, instance_states); #endif - } - - ::DDS::QueryCondition_ptr - RTI_DataReader_i::create_querycondition ( - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states, - const char * query_expression, - const ::DDS::StringSeq & query_parameters) - { + } + + ::DDS::QueryCondition_ptr + CCM_DDS_DataReader_i::create_querycondition ( + ::DDS::SampleStateMask sample_states, + ::DDS::ViewStateMask view_states, + ::DDS::InstanceStateMask instance_states, + const char * query_expression, + const ::DDS::StringSeq & query_parameters) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_StringSeq parameters; - parameters <<= query_parameters; - - ::DDS::QueryCondition_var retval = ::DDS::QueryCondition::_nil (); - ACE_NEW_THROW_EX (retval, - RTI_QueryCondition_i (), - CORBA::NO_MEMORY ()); - - DDSQueryCondition* qc = this->impl ()->create_querycondition ( - sample_states, - view_states, - instance_states, - query_expression, - parameters); - - RTI_QueryCondition_i *rti_qc = dynamic_cast < RTI_QueryCondition_i *> (retval.in ()); - rti_qc->set_impl (qc); - return retval._retn (); + DDS_StringSeq parameters; + parameters <<= query_parameters; + + ::DDS::QueryCondition_var retval = ::DDS::QueryCondition::_nil (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_QueryCondition_i (), + CORBA::NO_MEMORY ()); + + DDSQueryCondition* qc = this->impl ()->create_querycondition ( + sample_states, + view_states, + instance_states, + query_expression, + parameters); + + CCM_DDS_QueryCondition_i *rti_qc = dynamic_cast < CCM_DDS_QueryCondition_i *> (retval.in ()); + rti_qc->set_impl (qc); + return retval._retn (); #else - return this->impl ()->create_querycondition ( - sample_states, - view_states, - instance_states, - query_expression, - query_parameters); + return this->impl ()->create_querycondition ( + sample_states, + view_states, + instance_states, + query_expression, + query_parameters); #endif - } + } - ::DDS::ReturnCode_t - RTI_DataReader_i::delete_readcondition ( - ::DDS::ReadCondition_ptr a_condition) - { + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::delete_readcondition ( + ::DDS::ReadCondition_ptr a_condition) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - RTI_ReadCondition_i *rc = dynamic_cast< RTI_ReadCondition_i *> (a_condition); - if (!rc) - { - return ::DDS::RETCODE_BAD_PARAMETER; - } - return this->impl ()->delete_readcondition (rc->get_impl ()); + CCM_DDS_ReadCondition_i *rc = dynamic_cast< CCM_DDS_ReadCondition_i *> (a_condition); + if (!rc) + { + return ::DDS::RETCODE_BAD_PARAMETER; + } + return this->impl ()->delete_readcondition (rc->get_impl ()); #else - return this->impl ()->delete_readcondition (a_condition); + return this->impl ()->delete_readcondition (a_condition); #endif - } - - ::DDS::ReturnCode_t - RTI_DataReader_i::delete_contained_entities (void) - { - return this->impl ()->delete_contained_entities (); - } - - ::DDS::ReturnCode_t - RTI_DataReader_i::set_qos ( - const ::DDS::DataReaderQos &qos) - { + } + + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::delete_contained_entities (void) + { + return this->impl ()->delete_contained_entities (); + } + + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::set_qos ( + const ::DDS::DataReaderQos &qos) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_DataReaderQos ddsqos; - ddsqos <<= qos; - return this->impl ()->set_qos (ddsqos); + ::DDS_DataReaderQos ddsqos; + ddsqos <<= qos; + return this->impl ()->set_qos (ddsqos); #else - return this->impl ()->set_qos (qos); + return this->impl ()->set_qos (qos); #endif - } + } - ::DDS::ReturnCode_t - RTI_DataReader_i::get_qos ( - ::DDS::DataReaderQos &qos) - { + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::get_qos ( + ::DDS::DataReaderQos &qos) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_DataReaderQos ddsqos; - ::DDS_ReturnCode_t const retval = this->impl ()->get_qos (ddsqos); - qos <<= ddsqos; - return retval; + ::DDS_DataReaderQos ddsqos; + ::DDS_ReturnCode_t const retval = this->impl ()->get_qos (ddsqos); + qos <<= ddsqos; + return retval; #else - return this->impl ()->get_qos (qos); + return this->impl ()->get_qos (qos); #endif - } + } - ::DDS::ReturnCode_t - RTI_DataReader_i::set_listener ( - ::DDS::DataReaderListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("RTI_DataReader_i::set_listener"); + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::set_listener ( + ::DDS::DataReaderListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("CCM_DDS_DataReader_i::set_listener"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - RTI_DataReaderListener_i *rti_drl = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (rti_drl, - RTI_DataReaderListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - return this->impl ()->set_listener (rti_drl, mask); + CCM_DDS_DataReaderListener_i *rti_drl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_drl, + CCM_DDS_DataReaderListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + return this->impl ()->set_listener (rti_drl, mask); #else - return this->impl ()->set_listener (a_listener, mask); + return this->impl ()->set_listener (a_listener, mask); #endif - } + } - ::DDS::DataReaderListener_ptr - RTI_DataReader_i::get_listener (void) - { - DDS4CCM_TRACE ("RTI_DataReader_i::get_listener"); + ::DDS::DataReaderListener_ptr + CCM_DDS_DataReader_i::get_listener (void) + { + DDS4CCM_TRACE ("CCM_DDS_DataReader_i::get_listener"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSDataReaderListener *drl = this->impl ()->get_listener (); - RTI_DataReaderListener_i *rti_drl = dynamic_cast <RTI_DataReaderListener_i *> (drl); - if (!rti_drl) - { - DDS4CCM_DEBUG (6, (LM_DEBUG, "RTI_DataReader_i::get_listener - " - "DDS returned a NIL listener.\n")); - return ::DDS::DataReaderListener::_nil (); - } - return rti_drl->get_datareaderlistener (); + DDSDataReaderListener *drl = this->impl ()->get_listener (); + CCM_DDS_DataReaderListener_i *rti_drl = dynamic_cast <CCM_DDS_DataReaderListener_i *> (drl); + if (!rti_drl) + { + DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_DataReader_i::get_listener - " + "DDS returned a NIL listener.\n")); + return ::DDS::DataReaderListener::_nil (); + } + return rti_drl->get_datareaderlistener (); #else - return this->impl ()->get_listener (); + return this->impl ()->get_listener (); #endif - } + } - ::DDS::TopicDescription_ptr - RTI_DataReader_i::get_topicdescription (void) - { - ::DDS::TopicDescription_var dds_td = ::DDS::TopicDescription::_nil (); + ::DDS::TopicDescription_ptr + CCM_DDS_DataReader_i::get_topicdescription (void) + { + ::DDS::TopicDescription_var dds_td = ::DDS::TopicDescription::_nil (); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDSTopicDescription* td = this->impl ()->get_topicdescription (); - ACE_NEW_THROW_EX (dds_td, - CCM_DDS_TopicDescription_i (td), - CORBA::NO_MEMORY ()); + ::DDSTopicDescription* td = this->impl ()->get_topicdescription (); + ACE_NEW_THROW_EX (dds_td, + CCM_DDS_TopicDescription_i (td), + CORBA::NO_MEMORY ()); #else - ::DDS::TopicDescription_var td = this->impl ()->get_topicdescription (); - ACE_NEW_THROW_EX (dds_td, - CCM_DDS_TopicDescription_i (td.in ()), - CORBA::NO_MEMORY ()); + ::DDS::TopicDescription_var td = this->impl ()->get_topicdescription (); + ACE_NEW_THROW_EX (dds_td, + CCM_DDS_TopicDescription_i (td.in ()), + CORBA::NO_MEMORY ()); #endif - return dds_td._retn (); - } + return dds_td._retn (); + } - ::DDS::Subscriber_ptr - RTI_DataReader_i::get_subscriber (void) - { + ::DDS::Subscriber_ptr + CCM_DDS_DataReader_i::get_subscriber (void) + { + ::DDS::Subscriber_var dds_td = ::DDS::Subscriber::_nil (); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::Subscriber_var dds_td = ::DDS::Subscriber::_nil (); - ACE_NEW_THROW_EX (dds_td, - RTI_Subscriber_i (), - CORBA::NO_MEMORY ()); - - ::DDSSubscriber* subscriber = this->impl ()->get_subscriber (); - RTI_Subscriber_i *sub = dynamic_cast < RTI_Subscriber_i *>(dds_td.in ()); - sub->set_impl (subscriber); - return dds_td._retn (); + ::DDSSubscriber* subscriber = this->impl ()->get_subscriber (); + ACE_NEW_THROW_EX (dds_td, + CCM_DDS_Subscriber_i (subscriber), + CORBA::NO_MEMORY ()); #else - return this->impl ()->get_subscriber (); + ::DDSSubscriber_var subscriber = this->impl ()->get_subscriber (); + ACE_NEW_THROW_EX (dds_td, + CCM_DDS_Subscriber_i (subscriber.in ()), + CORBA::NO_MEMORY ()); #endif - } + return dds_td._retn (); + } - ::DDS::ReturnCode_t - RTI_DataReader_i::get_sample_rejected_status ( - ::DDS::SampleRejectedStatus & status) - { + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::get_sample_rejected_status ( + ::DDS::SampleRejectedStatus & status) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_SampleRejectedStatus rtistatus; - ::DDS::ReturnCode_t const retval = this->impl ()->get_sample_rejected_status (rtistatus); - rtistatus >>= status; - return retval; + DDS_SampleRejectedStatus rtistatus; + ::DDS::ReturnCode_t const retval = this->impl ()->get_sample_rejected_status (rtistatus); + rtistatus >>= status; + return retval; #else - return this->impl ()->get_sample_rejected_status (status); + return this->impl ()->get_sample_rejected_status (status); #endif - } + } - ::DDS::ReturnCode_t - RTI_DataReader_i::get_liveliness_changed_status ( - ::DDS::LivelinessChangedStatus & status) - { + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::get_liveliness_changed_status ( + ::DDS::LivelinessChangedStatus & status) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_LivelinessChangedStatus rtistatus; - ::DDS::ReturnCode_t const retval = this->impl ()->get_liveliness_changed_status (rtistatus); - rtistatus >>= status; - return retval; + DDS_LivelinessChangedStatus rtistatus; + ::DDS::ReturnCode_t const retval = this->impl ()->get_liveliness_changed_status (rtistatus); + rtistatus >>= status; + return retval; #else - return this->impl ()->get_liveliness_changed_status (status); + return this->impl ()->get_liveliness_changed_status (status); #endif - } + } - ::DDS::ReturnCode_t - RTI_DataReader_i::get_requested_deadline_missed_status ( - ::DDS::RequestedDeadlineMissedStatus & status) - { + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::get_requested_deadline_missed_status ( + ::DDS::RequestedDeadlineMissedStatus & status) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_RequestedDeadlineMissedStatus rtistatus; - ::DDS::ReturnCode_t const retval = this->impl ()->get_requested_deadline_missed_status (rtistatus); - rtistatus >>= status; - return retval; + DDS_RequestedDeadlineMissedStatus rtistatus; + ::DDS::ReturnCode_t const retval = this->impl ()->get_requested_deadline_missed_status (rtistatus); + rtistatus >>= status; + return retval; #else - return this->impl ()->get_requested_deadline_missed_status (status); + return this->impl ()->get_requested_deadline_missed_status (status); #endif - } + } - ::DDS::ReturnCode_t - RTI_DataReader_i::get_requested_incompatible_qos_status ( - ::DDS::RequestedIncompatibleQosStatus & status) - { + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::get_requested_incompatible_qos_status ( + ::DDS::RequestedIncompatibleQosStatus & status) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_RequestedIncompatibleQosStatus rtistatus; - ::DDS::ReturnCode_t const retval = this->impl ()->get_requested_incompatible_qos_status (rtistatus); - rtistatus >>= status; - return retval; + DDS_RequestedIncompatibleQosStatus rtistatus; + ::DDS::ReturnCode_t const retval = this->impl ()->get_requested_incompatible_qos_status (rtistatus); + rtistatus >>= status; + return retval; #else - return this->impl ()->get_requested_incompatible_qos_status (status); + return this->impl ()->get_requested_incompatible_qos_status (status); #endif - } + } - ::DDS::ReturnCode_t - RTI_DataReader_i::get_subscription_matched_status ( - ::DDS::SubscriptionMatchedStatus & status) - { + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::get_subscription_matched_status ( + ::DDS::SubscriptionMatchedStatus & status) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_SubscriptionMatchedStatus ddsstatus; - ::DDS::ReturnCode_t const retval = this->impl ()->get_subscription_matched_status (ddsstatus); - ddsstatus >>= status; - return retval; + ::DDS_SubscriptionMatchedStatus ddsstatus; + ::DDS::ReturnCode_t const retval = this->impl ()->get_subscription_matched_status (ddsstatus); + ddsstatus >>= status; + return retval; #else - return this->impl ()->get_subscription_matched_status (status); + return this->impl ()->get_subscription_matched_status (status); #endif - } + } - ::DDS::ReturnCode_t - RTI_DataReader_i::get_sample_lost_status ( - ::DDS::SampleLostStatus & status) - { + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::get_sample_lost_status ( + ::DDS::SampleLostStatus & status) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_SampleLostStatus rtistatus; - ::DDS::ReturnCode_t const retval = this->impl ()->get_sample_lost_status (rtistatus); - rtistatus >>= status; - return retval; + DDS_SampleLostStatus rtistatus; + ::DDS::ReturnCode_t const retval = this->impl ()->get_sample_lost_status (rtistatus); + rtistatus >>= status; + return retval; #else - return this->impl ()->get_sample_lost_status (status); + return this->impl ()->get_sample_lost_status (status); #endif - } + } - ::DDS::ReturnCode_t - RTI_DataReader_i::wait_for_historical_data ( - const ::DDS::Duration_t & max_wait) - { + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::wait_for_historical_data ( + const ::DDS::Duration_t & max_wait) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_Duration_t rtiduration; - rtiduration <<= max_wait; - return this->impl ()->wait_for_historical_data (rtiduration); + ::DDS_Duration_t rtiduration; + rtiduration <<= max_wait; + return this->impl ()->wait_for_historical_data (rtiduration); #else - return this->impl ()->wait_for_historical_data (max_wait); + return this->impl ()->wait_for_historical_data (max_wait); #endif - } + } - ::DDS::ReturnCode_t - RTI_DataReader_i::get_matched_publications ( - ::DDS::InstanceHandleSeq & publication_handles) - { + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::get_matched_publications ( + ::DDS::InstanceHandleSeq & publication_handles) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandleSeq rtiseq; - ::DDS::ReturnCode_t const retval = this->impl ()->get_matched_publications (rtiseq); - rtiseq >>= publication_handles; - return retval; + ::DDS_InstanceHandleSeq rtiseq; + ::DDS::ReturnCode_t const retval = this->impl ()->get_matched_publications (rtiseq); + rtiseq >>= publication_handles; + return retval; #else - return this->impl ()->get_matched_publications (publication_handles); + return this->impl ()->get_matched_publications (publication_handles); #endif - } + } - ::DDS::ReturnCode_t - RTI_DataReader_i::get_matched_publication_data ( - ::DDS::PublicationBuiltinTopicData & publication_data, - DDS_INSTANCE_HANDLE_T_IN publication_handle) - { + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::get_matched_publication_data ( + ::DDS::PublicationBuiltinTopicData & publication_data, + DDS_INSTANCE_HANDLE_T_IN publication_handle) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ACE_UNUSED_ARG (publication_data); - ACE_UNUSED_ARG (publication_handle); - throw CORBA::NO_IMPLEMENT (); - // Add your implementation here + ACE_UNUSED_ARG (publication_data); + ACE_UNUSED_ARG (publication_handle); + throw CORBA::NO_IMPLEMENT (); + // Add your implementation here #else - return this->impl ()->get_matched_publication_data (publication_data, publication_handle); + return this->impl ()->get_matched_publication_data (publication_data, publication_handle); #endif - } - - DDSDataReader * - RTI_DataReader_i::get_impl (void) - { - return this->impl_; - } - - void - RTI_DataReader_i::set_impl (DDSDataReader * dr) - { - this->impl_ = dr; - } - - DDSDataReader * - RTI_DataReader_i::impl (void) - { - if (!this->impl_) - { - throw ::CORBA::BAD_INV_ORDER (); - } - return this->impl_; - } + } + + DDSDataReader * + CCM_DDS_DataReader_i::get_impl (void) + { + return this->impl_; + } + void + CCM_DDS_DataReader_i::set_impl (DDSDataReader * dr) + { + this->impl_ = dr; + } + + DDSDataReader * + CCM_DDS_DataReader_i::impl (void) + { + if (!this->impl_) + { + throw ::CORBA::BAD_INV_ORDER (); + } + return this->impl_; } } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h index 4d641598698..d7e1a43722f 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h @@ -30,116 +30,113 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DataReader_i + : public virtual ::DDS::CCM_DataReader, + public virtual ::CORBA::LocalObject { - class DDS4CCM_NDDS_IMPL_Export RTI_DataReader_i - : public virtual ::DDS::CCM_DataReader, - public virtual ::CORBA::LocalObject - { - public: - // Constructor - RTI_DataReader_i (void); + public: + /// Constructor + CCM_DDS_DataReader_i (void); - // Destructor - virtual ~RTI_DataReader_i (void); + /// Destructor + virtual ~CCM_DDS_DataReader_i (void); - virtual ::DDS::ReturnCode_t - enable (void); + virtual ::DDS::ReturnCode_t + enable (void); - virtual ::DDS::StatusCondition_ptr - get_statuscondition (void); + virtual ::DDS::StatusCondition_ptr + get_statuscondition (void); - virtual ::DDS::StatusMask - get_status_changes (void); + virtual ::DDS::StatusMask + get_status_changes (void); - virtual DDS_INSTANCE_HANDLE_T_RETN - get_instance_handle (void); + virtual DDS_INSTANCE_HANDLE_T_RETN + get_instance_handle (void); - virtual ::DDS::ReadCondition_ptr - create_readcondition ( - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states); + virtual ::DDS::ReadCondition_ptr + create_readcondition ( + ::DDS::SampleStateMask sample_states, + ::DDS::ViewStateMask view_states, + ::DDS::InstanceStateMask instance_states); - virtual ::DDS::QueryCondition_ptr - create_querycondition ( - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states, - const char * query_expression, - const ::DDS::StringSeq & query_parameters); + virtual ::DDS::QueryCondition_ptr + create_querycondition ( + ::DDS::SampleStateMask sample_states, + ::DDS::ViewStateMask view_states, + ::DDS::InstanceStateMask instance_states, + const char * query_expression, + const ::DDS::StringSeq & query_parameters); - virtual ::DDS::ReturnCode_t - delete_readcondition ( - ::DDS::ReadCondition_ptr a_condition); + virtual ::DDS::ReturnCode_t + delete_readcondition ( + ::DDS::ReadCondition_ptr a_condition); - virtual ::DDS::ReturnCode_t - delete_contained_entities (void); + virtual ::DDS::ReturnCode_t + delete_contained_entities (void); - virtual ::DDS::ReturnCode_t - set_qos (const ::DDS::DataReaderQos & qos); + virtual ::DDS::ReturnCode_t + set_qos (const ::DDS::DataReaderQos & qos); - virtual ::DDS::ReturnCode_t - get_qos (::DDS::DataReaderQos & qos); + virtual ::DDS::ReturnCode_t + get_qos (::DDS::DataReaderQos & qos); - virtual ::DDS::ReturnCode_t - set_listener ( - ::DDS::DataReaderListener_ptr a_listener, - ::DDS::StatusMask mask); + virtual ::DDS::ReturnCode_t + set_listener ( + ::DDS::DataReaderListener_ptr a_listener, + ::DDS::StatusMask mask); - virtual ::DDS::DataReaderListener_ptr - get_listener (void); + virtual ::DDS::DataReaderListener_ptr + get_listener (void); - virtual ::DDS::TopicDescription_ptr - get_topicdescription (void); + virtual ::DDS::TopicDescription_ptr + get_topicdescription (void); - virtual ::DDS::Subscriber_ptr - get_subscriber (void); + virtual ::DDS::Subscriber_ptr + get_subscriber (void); - virtual ::DDS::ReturnCode_t - get_sample_rejected_status (::DDS::SampleRejectedStatus & status); + virtual ::DDS::ReturnCode_t + get_sample_rejected_status (::DDS::SampleRejectedStatus & status); - virtual ::DDS::ReturnCode_t - get_liveliness_changed_status ( - ::DDS::LivelinessChangedStatus & status); + virtual ::DDS::ReturnCode_t + get_liveliness_changed_status ( + ::DDS::LivelinessChangedStatus & status); - virtual ::DDS::ReturnCode_t - get_requested_deadline_missed_status ( - ::DDS::RequestedDeadlineMissedStatus & status); + virtual ::DDS::ReturnCode_t + get_requested_deadline_missed_status ( + ::DDS::RequestedDeadlineMissedStatus & status); - virtual ::DDS::ReturnCode_t - get_requested_incompatible_qos_status ( - ::DDS::RequestedIncompatibleQosStatus & status); + virtual ::DDS::ReturnCode_t + get_requested_incompatible_qos_status ( + ::DDS::RequestedIncompatibleQosStatus & status); - virtual ::DDS::ReturnCode_t - get_subscription_matched_status ( - ::DDS::SubscriptionMatchedStatus & status); + virtual ::DDS::ReturnCode_t + get_subscription_matched_status ( + ::DDS::SubscriptionMatchedStatus & status); - virtual ::DDS::ReturnCode_t - get_sample_lost_status (::DDS::SampleLostStatus & status); + virtual ::DDS::ReturnCode_t + get_sample_lost_status (::DDS::SampleLostStatus & status); - virtual ::DDS::ReturnCode_t - wait_for_historical_data (const ::DDS::Duration_t & max_wait); + virtual ::DDS::ReturnCode_t + wait_for_historical_data (const ::DDS::Duration_t & max_wait); - virtual ::DDS::ReturnCode_t - get_matched_publications ( - ::DDS::InstanceHandleSeq & publication_handles); + virtual ::DDS::ReturnCode_t + get_matched_publications ( + ::DDS::InstanceHandleSeq & publication_handles); - virtual ::DDS::ReturnCode_t - get_matched_publication_data ( - ::DDS::PublicationBuiltinTopicData & publication_data, - DDS_INSTANCE_HANDLE_T_IN publication_handle); + virtual ::DDS::ReturnCode_t + get_matched_publication_data ( + ::DDS::PublicationBuiltinTopicData & publication_data, + DDS_INSTANCE_HANDLE_T_IN publication_handle); - DDSDataReader * get_impl (void); + DDSDataReader * get_impl (void); - void set_impl (DDSDataReader * dr); + void set_impl (DDSDataReader * dr); - private: - DDSDataReader * impl_; + private: + DDSDataReader * impl_; - DDSDataReader * impl (void); - }; - } + DDSDataReader * impl (void); + }; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp index fda470768b0..5b4e276f614 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp @@ -7,8 +7,8 @@ template <typename DDS_TYPE, typename CCM_TYPE> -CIAO::DDS4CCM::RTI::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>::DataReaderHandler_T ( - typename CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>* drl, +CIAO::DDS4CCM::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>::DataReaderHandler_T ( + typename CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>* drl, ::DDS::DataReader_ptr dr) : drl_ (drl), dr_ (::DDS::DataReader::_duplicate (dr)) @@ -18,13 +18,13 @@ CIAO::DDS4CCM::RTI::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>::DataReaderHandler_T } template <typename DDS_TYPE, typename CCM_TYPE> -CIAO::DDS4CCM::RTI::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>::~DataReaderHandler_T (void) +CIAO::DDS4CCM::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>::~DataReaderHandler_T (void) { } template <typename DDS_TYPE, typename CCM_TYPE> int -CIAO::DDS4CCM::RTI::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>::handle_exception (ACE_HANDLE) +CIAO::DDS4CCM::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>::handle_exception (ACE_HANDLE) { try { @@ -37,8 +37,8 @@ CIAO::DDS4CCM::RTI::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>::handle_exception (A } template <typename DDS_TYPE, typename CCM_TYPE> -CIAO::DDS4CCM::RTI::DataReaderStateHandler_T<DDS_TYPE, CCM_TYPE>::DataReaderStateHandler_T ( - typename CIAO::DDS4CCM::RTI::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>* drl, +CIAO::DDS4CCM::DataReaderStateHandler_T<DDS_TYPE, CCM_TYPE>::DataReaderStateHandler_T ( + typename CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>* drl, ::DDS::DataReader_ptr dr) : drl_ (drl), dr_ (::DDS::DataReader::_duplicate (dr)) @@ -48,13 +48,13 @@ CIAO::DDS4CCM::RTI::DataReaderStateHandler_T<DDS_TYPE, CCM_TYPE>::DataReaderStat } template <typename DDS_TYPE, typename CCM_TYPE> -CIAO::DDS4CCM::RTI::DataReaderStateHandler_T<DDS_TYPE, CCM_TYPE>::~DataReaderStateHandler_T (void) +CIAO::DDS4CCM::DataReaderStateHandler_T<DDS_TYPE, CCM_TYPE>::~DataReaderStateHandler_T (void) { } template <typename DDS_TYPE, typename CCM_TYPE> int -CIAO::DDS4CCM::RTI::DataReaderStateHandler_T<DDS_TYPE, CCM_TYPE>::handle_exception (ACE_HANDLE) +CIAO::DDS4CCM::DataReaderStateHandler_T<DDS_TYPE, CCM_TYPE>::handle_exception (ACE_HANDLE) { try { diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h index 9c68129333a..6c4d0ed9724 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h @@ -18,46 +18,43 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI - { - template <typename DDS_TYPE, typename CCM_TYPE> - class DataReaderListener_T; - - template <typename DDS_TYPE, typename CCM_TYPE> - class DataReaderHandler_T : - public ACE_Event_Handler - { - public: - DataReaderHandler_T ( - typename CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>* drl, - ::DDS::DataReader_ptr dr); - virtual ~DataReaderHandler_T (); - - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - typename CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>* drl_; - ::DDS::DataReader_var dr_; - }; - - template <typename DDS_TYPE, typename CCM_TYPE> - class DataReaderStateListener_T; + template <typename DDS_TYPE, typename CCM_TYPE> + class DataReaderListener_T; - template <typename DDS_TYPE, typename CCM_TYPE> - class DataReaderStateHandler_T : - public ACE_Event_Handler - { - public: - DataReaderStateHandler_T ( - typename CIAO::DDS4CCM::RTI::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>* drl, - ::DDS::DataReader_ptr dr); - virtual ~DataReaderStateHandler_T (); - - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - typename CIAO::DDS4CCM::RTI::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>* drl_; - ::DDS::DataReader_var dr_; - }; - } + template <typename DDS_TYPE, typename CCM_TYPE> + class DataReaderHandler_T : + public ACE_Event_Handler + { + public: + DataReaderHandler_T ( + typename CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>* drl, + ::DDS::DataReader_ptr dr); + virtual ~DataReaderHandler_T (); + + virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); + private: + typename CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>* drl_; + ::DDS::DataReader_var dr_; + }; + + template <typename DDS_TYPE, typename CCM_TYPE> + class DataReaderStateListener_T; + + template <typename DDS_TYPE, typename CCM_TYPE> + class DataReaderStateHandler_T : + public ACE_Event_Handler + { + public: + DataReaderStateHandler_T ( + typename CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>* drl, + ::DDS::DataReader_ptr dr); + virtual ~DataReaderStateHandler_T (); + + virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); + private: + typename CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>* drl_; + ::DDS::DataReader_var dr_; + }; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp index cf307eb4251..a36630d250e 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp @@ -17,151 +17,148 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + CCM_DDS_DataReaderListener_i::CCM_DDS_DataReaderListener_i (::DDS::DataReaderListener_ptr p) + : impl_ (::DDS::DataReaderListener::_duplicate (p)) { - RTI_DataReaderListener_i::RTI_DataReaderListener_i (::DDS::DataReaderListener_ptr p) - : impl_ (::DDS::DataReaderListener::_duplicate (p)) - { - } + } - RTI_DataReaderListener_i::~RTI_DataReaderListener_i (void) - { - } + CCM_DDS_DataReaderListener_i::~CCM_DDS_DataReaderListener_i (void) + { + } - void - RTI_DataReaderListener_i::on_requested_deadline_missed ( - ::DDSDataReader* the_reader, - const ::DDS_RequestedDeadlineMissedStatus & status) - { - DDS4CCM_TRACE ("RTI_DataReaderListener_i::on_requested_deadline_missed"); + void + CCM_DDS_DataReaderListener_i::on_requested_deadline_missed ( + ::DDSDataReader* the_reader, + const ::DDS_RequestedDeadlineMissedStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_requested_deadline_missed"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::RequestedDeadlineMissedStatus ddsstatus; - ddsstatus <<= status; - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, RTI_DataReader_i ()); - RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ()); - rti_dr->set_impl (the_reader); - this->impl_->on_requested_deadline_missed (dds_reader.in (), ddsstatus); + ::DDS::RequestedDeadlineMissedStatus ddsstatus; + ddsstatus <<= status; + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, CCM_DDS_DataReader_i ()); + CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ()); + rti_dr->set_impl (the_reader); + this->impl_->on_requested_deadline_missed (dds_reader.in (), ddsstatus); #else - this->impl_->on_requested_deadline_missed (the_reader, status); + this->impl_->on_requested_deadline_missed (the_reader, status); #endif - } + } - void - RTI_DataReaderListener_i::on_requested_incompatible_qos ( - ::DDSDataReader* the_reader, - const ::DDS_RequestedIncompatibleQosStatus & status) - { - DDS4CCM_TRACE ("RTI_DataReaderListener_i::on_requested_incompatible_qos"); + void + CCM_DDS_DataReaderListener_i::on_requested_incompatible_qos ( + ::DDSDataReader* the_reader, + const ::DDS_RequestedIncompatibleQosStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_requested_incompatible_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::RequestedIncompatibleQosStatus ddsstatus; - ddsstatus <<= status; - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, RTI_DataReader_i ()); - RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ()); - rti_dr->set_impl (the_reader); - this->impl_->on_requested_incompatible_qos (dds_reader.in (), ddsstatus); + ::DDS::RequestedIncompatibleQosStatus ddsstatus; + ddsstatus <<= status; + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, CCM_DDS_DataReader_i ()); + CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ()); + rti_dr->set_impl (the_reader); + this->impl_->on_requested_incompatible_qos (dds_reader.in (), ddsstatus); #else - this->impl_->on_requested_incompatible_qos (the_reader, status); + this->impl_->on_requested_incompatible_qos (the_reader, status); #endif - } + } - void - RTI_DataReaderListener_i::on_sample_rejected ( - ::DDSDataReader* the_reader, - const ::DDS_SampleRejectedStatus & status) - { - DDS4CCM_TRACE ("RTI_DataReaderListener_i::on_sample_rejected"); + void + CCM_DDS_DataReaderListener_i::on_sample_rejected ( + ::DDSDataReader* the_reader, + const ::DDS_SampleRejectedStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_sample_rejected"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::SampleRejectedStatus ddsstatus; - ddsstatus <<= status; - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, RTI_DataReader_i ()); - RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ()); - rti_dr->set_impl (the_reader); - this->impl_->on_sample_rejected (dds_reader.in (), ddsstatus); + ::DDS::SampleRejectedStatus ddsstatus; + ddsstatus <<= status; + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, CCM_DDS_DataReader_i ()); + CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ()); + rti_dr->set_impl (the_reader); + this->impl_->on_sample_rejected (dds_reader.in (), ddsstatus); #else - this->impl_->on_sample_rejected (the_reader, status); + this->impl_->on_sample_rejected (the_reader, status); #endif - } + } - void - RTI_DataReaderListener_i::on_liveliness_changed ( - ::DDSDataReader* the_reader, - const ::DDS_LivelinessChangedStatus & status) - { - DDS4CCM_TRACE ("RTI_DataReaderListener_i::on_liveliness_changed"); + void + CCM_DDS_DataReaderListener_i::on_liveliness_changed ( + ::DDSDataReader* the_reader, + const ::DDS_LivelinessChangedStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_liveliness_changed"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::LivelinessChangedStatus ddsstatus; - ddsstatus <<= status; - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, RTI_DataReader_i ()); - RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ()); - rti_dr->set_impl (the_reader); - this->impl_->on_liveliness_changed (dds_reader.in (), ddsstatus); + ::DDS::LivelinessChangedStatus ddsstatus; + ddsstatus <<= status; + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, CCM_DDS_DataReader_i ()); + CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ()); + rti_dr->set_impl (the_reader); + this->impl_->on_liveliness_changed (dds_reader.in (), ddsstatus); #else - this->impl_->on_liveliness_changed (the_reader, status); + this->impl_->on_liveliness_changed (the_reader, status); #endif - } + } - void - RTI_DataReaderListener_i::on_data_available(::DDSDataReader *the_reader) - { - DDS4CCM_TRACE ("RTI_DataReaderListener_i::on_data_available"); + void + CCM_DDS_DataReaderListener_i::on_data_available(::DDSDataReader *the_reader) + { + DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_data_available"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, RTI_DataReader_i ()); - RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ()); - rti_dr->set_impl (the_reader); - this->impl_->on_data_available (dds_reader.in ()); + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, CCM_DDS_DataReader_i ()); + CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ()); + rti_dr->set_impl (the_reader); + this->impl_->on_data_available (dds_reader.in ()); #else - this->impl_->on_data_available (the_reader); + this->impl_->on_data_available (the_reader); #endif - } + } - void - RTI_DataReaderListener_i::on_subscription_matched ( - ::DDSDataReader* the_reader, - const ::DDS_SubscriptionMatchedStatus & status) - { - DDS4CCM_TRACE ("RTI_DataReaderListener_i::on_subscription_matched"); + void + CCM_DDS_DataReaderListener_i::on_subscription_matched ( + ::DDSDataReader* the_reader, + const ::DDS_SubscriptionMatchedStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_subscription_matched"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::SubscriptionMatchedStatus ddsstatus; - ddsstatus <<= status; - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, RTI_DataReader_i ()); - RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ()); - rti_dr->set_impl (the_reader); - this->impl_->on_subscription_matched (dds_reader.in (), ddsstatus); + ::DDS::SubscriptionMatchedStatus ddsstatus; + ddsstatus <<= status; + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, CCM_DDS_DataReader_i ()); + CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ()); + rti_dr->set_impl (the_reader); + this->impl_->on_subscription_matched (dds_reader.in (), ddsstatus); #else - this->impl_->on_subscription_matched (the_reader, status); + this->impl_->on_subscription_matched (the_reader, status); #endif - } + } - void - RTI_DataReaderListener_i::on_sample_lost ( - ::DDSDataReader* the_reader, - const ::DDS_SampleLostStatus & status) - { - DDS4CCM_TRACE ("RTI_DataReaderListener_i::on_sample_lost"); + void + CCM_DDS_DataReaderListener_i::on_sample_lost ( + ::DDSDataReader* the_reader, + const ::DDS_SampleLostStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_sample_lost"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::SampleLostStatus ddsstatus; - ddsstatus <<= status; - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, RTI_DataReader_i ()); - RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ()); - rti_dr->set_impl (the_reader); - this->impl_->on_sample_lost (dds_reader.in (), ddsstatus); + ::DDS::SampleLostStatus ddsstatus; + ddsstatus <<= status; + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, CCM_DDS_DataReader_i ()); + CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ()); + rti_dr->set_impl (the_reader); + this->impl_->on_sample_lost (dds_reader.in (), ddsstatus); #else - this->impl_->on_sample_lost (the_reader, status); + this->impl_->on_sample_lost (the_reader, status); #endif - } + } - ::DDS::DataReaderListener_ptr - RTI_DataReaderListener_i::get_datareaderlistener (void) - { - return ::DDS::DataReaderListener::_duplicate (this->impl_.in ()); - } + ::DDS::DataReaderListener_ptr + CCM_DDS_DataReaderListener_i::get_datareaderlistener (void) + { + return ::DDS::DataReaderListener::_duplicate (this->impl_.in ()); } } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h index c7b4b339291..b236c576f1a 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h @@ -33,43 +33,40 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DataReaderListener_i : + public virtual ::DDSDataReaderListener { - class DDS4CCM_NDDS_IMPL_Export RTI_DataReaderListener_i : - public virtual ::DDSDataReaderListener - { - public: - // Constructor - RTI_DataReaderListener_i (::DDS::DataReaderListener_ptr p); + public: + /// Constructor + CCM_DDS_DataReaderListener_i (::DDS::DataReaderListener_ptr p); - // Destructor - virtual ~RTI_DataReaderListener_i (void); + /// Destructor + virtual ~CCM_DDS_DataReaderListener_i (void); - virtual void on_requested_deadline_missed(::DDSDataReader* reader, - const ::DDS_RequestedDeadlineMissedStatus& status); + virtual void on_requested_deadline_missed(::DDSDataReader* reader, + const ::DDS_RequestedDeadlineMissedStatus& status); - virtual void on_liveliness_changed(::DDSDataReader* reader, - const ::DDS_LivelinessChangedStatus& status); + virtual void on_liveliness_changed(::DDSDataReader* reader, + const ::DDS_LivelinessChangedStatus& status); - virtual void on_requested_incompatible_qos(::DDSDataReader* reader, - const ::DDS_RequestedIncompatibleQosStatus& status); + virtual void on_requested_incompatible_qos(::DDSDataReader* reader, + const ::DDS_RequestedIncompatibleQosStatus& status); - virtual void on_sample_rejected(::DDSDataReader* reader, - const ::DDS_SampleRejectedStatus& status); + virtual void on_sample_rejected(::DDSDataReader* reader, + const ::DDS_SampleRejectedStatus& status); - virtual void on_data_available(::DDSDataReader* reader); + virtual void on_data_available(::DDSDataReader* reader); - virtual void on_sample_lost(::DDSDataReader* reader, - const ::DDS_SampleLostStatus& status); + virtual void on_sample_lost(::DDSDataReader* reader, + const ::DDS_SampleLostStatus& status); - virtual void on_subscription_matched(::DDSDataReader* reader, - const ::DDS_SubscriptionMatchedStatus& status); + virtual void on_subscription_matched(::DDSDataReader* reader, + const ::DDS_SubscriptionMatchedStatus& status); - ::DDS::DataReaderListener_ptr get_datareaderlistener (void); - private: - ::DDS::DataReaderListener_var impl_; - }; - } + ::DDS::DataReaderListener_ptr get_datareaderlistener (void); + private: + ::DDS::DataReaderListener_var impl_; + }; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp index dfe2303c15d..103b226130b 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp @@ -6,7 +6,7 @@ #include "ace/Reactor.h" template <typename DDS_TYPE, typename CCM_TYPE> -CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::DataReaderListener_T ( +CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::DataReaderListener_T ( typename CCM_TYPE::listener_type::_ptr_type listener, ::CCM_DDS::PortStatusListener_ptr port_status_listener, ::CCM_DDS::DataListenerControl_ptr control, @@ -15,20 +15,20 @@ CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::DataReaderListener listener_ (CCM_TYPE::listener_type::_duplicate (listener)), control_ (::CCM_DDS::DataListenerControl::_duplicate (control)) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::DataReaderListener_T::DataReaderListener_T"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderListener_T::DataReaderListener_T"); } template <typename DDS_TYPE, typename CCM_TYPE> -CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::~DataReaderListener_T (void) +CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::~DataReaderListener_T (void) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::DataReaderListener_T::~DataReaderListener_T"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderListener_T::~DataReaderListener_T"); } template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available(::DDS::DataReader_ptr rdr) +CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available(::DDS::DataReader_ptr rdr) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::DataReaderListener_T::on_data_available"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderListener_T::on_data_available"); if (CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED) { @@ -56,17 +56,17 @@ CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available( template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_i (::DDS::DataReader_ptr rdr) +CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_i (::DDS::DataReader_ptr rdr) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::DataReaderListener_T::on_data_available_i"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderListener_T::on_data_available_i"); if (CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED) { return; } - ::CIAO::DDS4CCM::RTI::RTI_DataReader_i* rd = - dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DataReader_i*>(rdr); + ::CIAO::DDS4CCM::CCM_DDS_DataReader_i* rd = + dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataReader_i*>(rdr); if (!rd) { /* In this specific case, this will never fail */ @@ -154,7 +154,7 @@ CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_ template <typename DDS_TYPE, typename CCM_TYPE> ::DDS::StatusMask -CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::get_mask ( +CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::get_mask ( typename CCM_TYPE::listener_type::_ptr_type listener) { if (!CORBA::is_nil (listener) || CIAO_debug_level >= 10) diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.h index 94643166fc0..7dbd4af959d 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.h @@ -20,37 +20,34 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + template <typename DDS_TYPE, typename CCM_TYPE> + class DataReaderListener_T : + public PortStatusListener_T <DDS_TYPE, CCM_TYPE> { - template <typename DDS_TYPE, typename CCM_TYPE> - class DataReaderListener_T : - public PortStatusListener_T <DDS_TYPE, CCM_TYPE> - { - public: - /// Constructor - DataReaderListener_T ( - typename CCM_TYPE::listener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr port_status_listener, - ::CCM_DDS::DataListenerControl_ptr control, - ACE_Reactor* reactor); - - /// Destructor - virtual ~DataReaderListener_T (void); - - virtual void on_data_available( ::DDS::DataReader *rdr); - - static ::DDS::StatusMask get_mask ( - typename CCM_TYPE::listener_type::_ptr_type listener); - - void on_data_available_i ( ::DDS::DataReader *rdr); - - private: - typename CCM_TYPE::listener_type::_var_type listener_; - ::CCM_DDS::DataListenerControl_var control_; - - typedef ::CIAO::DDS4CCM::RTI::DataReaderHandler_T<DDS_TYPE, CCM_TYPE> drh; - }; - } + public: + /// Constructor + DataReaderListener_T ( + typename CCM_TYPE::listener_type::_ptr_type listener, + ::CCM_DDS::PortStatusListener_ptr port_status_listener, + ::CCM_DDS::DataListenerControl_ptr control, + ACE_Reactor* reactor); + + /// Destructor + virtual ~DataReaderListener_T (void); + + virtual void on_data_available( ::DDS::DataReader *rdr); + + static ::DDS::StatusMask get_mask ( + typename CCM_TYPE::listener_type::_ptr_type listener); + + void on_data_available_i ( ::DDS::DataReader *rdr); + + private: + typename CCM_TYPE::listener_type::_var_type listener_; + ::CCM_DDS::DataListenerControl_var control_; + + typedef ::CIAO::DDS4CCM::DataReaderHandler_T<DDS_TYPE, CCM_TYPE> drh; + }; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp index 09097ef6966..896b446ac58 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp @@ -63,8 +63,8 @@ CIAO::DDS4CCM::RTI::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::on_data_avail if (CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED) return; - ::CIAO::DDS4CCM::RTI::RTI_DataReader_i* rd = - dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DataReader_i*>(rdr); + ::CIAO::DDS4CCM::RTI::CCM_DDS_DataReader_i* rd = + dynamic_cast < ::CIAO::DDS4CCM::RTI::CCM_DDS_DataReader_i*>(rdr); if (!rd) { /* In this specific case, this will never fail */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h index 925ce23233e..5fb3e3a42a6 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h @@ -45,8 +45,7 @@ namespace CIAO typename CCM_TYPE::statelistener_type::_var_type listener_; ::CCM_DDS::StateListenerControl_var control_; - typedef ::CIAO::DDS4CCM::RTI::DataReaderStateHandler_T<DDS_TYPE, CCM_TYPE> drsh; - + typedef ::CIAO::DDS4CCM::DataReaderStateHandler_T<DDS_TYPE, CCM_TYPE> drsh; }; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp index c8026c6cd0c..8bf1cddf5aa 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp @@ -19,278 +19,274 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + CCM_DDS_DataWriter_i::CCM_DDS_DataWriter_i (void) + : impl_ (0) { - RTI_DataWriter_i::RTI_DataWriter_i (void) - : impl_ (0) - { - } + } - RTI_DataWriter_i::~RTI_DataWriter_i (void) - { - } + CCM_DDS_DataWriter_i::~CCM_DDS_DataWriter_i (void) + { + } - ::DDS::ReturnCode_t - RTI_DataWriter_i::set_qos (const ::DDS::DataWriterQos & qos) - { - DDS4CCM_TRACE ("RTI_DataWriter_i::set_qos"); + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::set_qos (const ::DDS::DataWriterQos & qos) + { + DDS4CCM_TRACE ("CCM_DDS_DataWriter_i::set_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ACE_UNUSED_ARG (qos); - throw CORBA::NO_IMPLEMENT (); - // Add your implementation here + ACE_UNUSED_ARG (qos); + throw CORBA::NO_IMPLEMENT (); + // Add your implementation here #else - return this->impl ()->set_qos (qos); + return this->impl ()->set_qos (qos); #endif - } + } - ::DDS::ReturnCode_t - RTI_DataWriter_i::get_qos (::DDS::DataWriterQos & qos) - { - DDS4CCM_TRACE ("RTI_DataWriter_i::get_qos"); + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::get_qos (::DDS::DataWriterQos & qos) + { + DDS4CCM_TRACE ("CCM_DDS_DataWriter_i::get_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ACE_UNUSED_ARG (qos); - throw CORBA::NO_IMPLEMENT (); - // Add your implementation here + ACE_UNUSED_ARG (qos); + throw CORBA::NO_IMPLEMENT (); + // Add your implementation here #else - return this->impl ()->get_qos (qos); + return this->impl ()->get_qos (qos); #endif - } + } - ::DDS::ReturnCode_t - RTI_DataWriter_i::set_listener (::DDS::DataWriterListener_ptr a_listener, - ::DDS::StatusMask mask) - { + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::set_listener (::DDS::DataWriterListener_ptr a_listener, + ::DDS::StatusMask mask) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - RTI_DataWriterListener_i* rti_impl_list = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (rti_impl_list, - RTI_DataWriterListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - return this->impl ()->set_listener (rti_impl_list, mask); + CCM_DDS_DataWriterListener_i* rti_impl_list = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_impl_list, + CCM_DDS_DataWriterListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + return this->impl ()->set_listener (rti_impl_list, mask); #else - return this->impl ()->set_listener (a_listener, mask); + return this->impl ()->set_listener (a_listener, mask); #endif - } + } - ::DDS::DataWriterListener_ptr - RTI_DataWriter_i::get_listener (void) - { + ::DDS::DataWriterListener_ptr + CCM_DDS_DataWriter_i::get_listener (void) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSDataWriterListener *wr = this->impl ()->get_listener (); - RTI_DataWriterListener_i *list_proxy = dynamic_cast <RTI_DataWriterListener_i *> (wr); - if (!list_proxy) - { - DDS4CCM_DEBUG (6, (LM_DEBUG, "RTI_DataWriter_i::get_listener - " - "DDS returned a NIL listener.\n")); - return ::DDS::DataWriterListener::_nil (); - } - return list_proxy->get_datawriterlistener (); + DDSDataWriterListener *wr = this->impl ()->get_listener (); + CCM_DDS_DataWriterListener_i *list_proxy = dynamic_cast <CCM_DDS_DataWriterListener_i *> (wr); + if (!list_proxy) + { + DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_DataWriter_i::get_listener - " + "DDS returned a NIL listener.\n")); + return ::DDS::DataWriterListener::_nil (); + } + return list_proxy->get_datawriterlistener (); #else - return this->impl ()->get_listener (); + return this->impl ()->get_listener (); #endif - } + } - ::DDS::Topic_ptr - RTI_DataWriter_i::get_topic (void) - { - ::DDS::Topic_var retval = ::DDS::Topic::_nil (); + ::DDS::Topic_ptr + CCM_DDS_DataWriter_i::get_topic (void) + { + ::DDS::Topic_var retval = ::DDS::Topic::_nil (); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSTopic* t = this->impl ()->get_topic (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_Topic_i (t), - CORBA::NO_MEMORY ()); + DDSTopic* t = this->impl ()->get_topic (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_Topic_i (t), + CORBA::NO_MEMORY ()); #else - ::DDS::Topic_var t = this->impl ()->get_topic (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_Topic_i (t.in ()), - CORBA::NO_MEMORY ()); + ::DDS::Topic_var t = this->impl ()->get_topic (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_Topic_i (t.in ()), + CORBA::NO_MEMORY ()); #endif - return retval._retn (); - } + return retval._retn (); + } - ::DDS::Publisher_ptr - RTI_DataWriter_i::get_publisher (void) - { + ::DDS::Publisher_ptr + CCM_DDS_DataWriter_i::get_publisher (void) + { + ::DDS::Publisher_var retval = ::DDS::Publisher::_nil (); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::Publisher_var retval = ::DDS::Publisher::_nil (); - ACE_NEW_THROW_EX (retval, - RTI_Publisher_i (), - CORBA::NO_MEMORY ()); - - DDSPublisher* p = this->impl ()->get_publisher (); - RTI_Publisher_i *rti_p = dynamic_cast < RTI_Publisher_i *> (retval.in ()); - rti_p->set_impl (p); - return retval._retn (); + DDSPublisher* p = this->impl ()->get_publisher (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_Publisher_i (p), + CORBA::NO_MEMORY ()); #else - return this->impl ()->get_publisher (); + ::DDS::Publisher_var p = this->impl ()->get_publisher (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_Publisher_i (p.in ()), + CORBA::NO_MEMORY ()); #endif - } + return retval._retn (); + } - ::DDS::ReturnCode_t - RTI_DataWriter_i::wait_for_acknowledgments (const ::DDS::Duration_t & max_wait) - { + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::wait_for_acknowledgments (const ::DDS::Duration_t & max_wait) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_Duration_t rtiduration; - rtiduration <<= max_wait; - return this->impl ()->wait_for_acknowledgments (rtiduration); + ::DDS_Duration_t rtiduration; + rtiduration <<= max_wait; + return this->impl ()->wait_for_acknowledgments (rtiduration); #else - return this->impl ()->wait_for_acknowledgments (max_wait); + return this->impl ()->wait_for_acknowledgments (max_wait); #endif - } + } - ::DDS::ReturnCode_t - RTI_DataWriter_i::get_liveliness_lost_status (::DDS::LivelinessLostStatus & status) - { + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::get_liveliness_lost_status (::DDS::LivelinessLostStatus & status) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_LivelinessLostStatus rtistatus; - ::DDS::ReturnCode_t const retval = this->impl ()->get_liveliness_lost_status (rtistatus); - rtistatus >>= status; - return retval; + ::DDS_LivelinessLostStatus rtistatus; + ::DDS::ReturnCode_t const retval = this->impl ()->get_liveliness_lost_status (rtistatus); + rtistatus >>= status; + return retval; #else - return this->impl ()->get_liveliness_lost_status (status); + return this->impl ()->get_liveliness_lost_status (status); #endif - } + } - ::DDS::ReturnCode_t - RTI_DataWriter_i::get_offered_deadline_missed_status (::DDS::OfferedDeadlineMissedStatus & status) - { + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::get_offered_deadline_missed_status (::DDS::OfferedDeadlineMissedStatus & status) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_OfferedDeadlineMissedStatus rtistatus; - ::DDS::ReturnCode_t const retval = this->impl ()->get_offered_deadline_missed_status (rtistatus); - rtistatus >>= status; - return retval; + ::DDS_OfferedDeadlineMissedStatus rtistatus; + ::DDS::ReturnCode_t const retval = this->impl ()->get_offered_deadline_missed_status (rtistatus); + rtistatus >>= status; + return retval; #else - return this->impl ()->get_offered_deadline_missed_status (status); + return this->impl ()->get_offered_deadline_missed_status (status); #endif - } + } - ::DDS::ReturnCode_t - RTI_DataWriter_i::get_offered_incompatible_qos_status (::DDS::OfferedIncompatibleQosStatus & status) - { + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::get_offered_incompatible_qos_status (::DDS::OfferedIncompatibleQosStatus & status) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_OfferedIncompatibleQosStatus rtistatus; - ::DDS::ReturnCode_t const retval = this->impl ()->get_offered_incompatible_qos_status (rtistatus); - rtistatus >>= status; - return retval; + ::DDS_OfferedIncompatibleQosStatus rtistatus; + ::DDS::ReturnCode_t const retval = this->impl ()->get_offered_incompatible_qos_status (rtistatus); + rtistatus >>= status; + return retval; #else - return this->impl ()->get_offered_incompatible_qos_status (status); + return this->impl ()->get_offered_incompatible_qos_status (status); #endif - } + } - ::DDS::ReturnCode_t - RTI_DataWriter_i::get_publication_matched_status (::DDS::PublicationMatchedStatus & status) - { + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::get_publication_matched_status (::DDS::PublicationMatchedStatus & status) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_PublicationMatchedStatus rtistatus; - ::DDS::ReturnCode_t const retval = this->impl ()->get_publication_matched_status (rtistatus); - rtistatus >>= status; - return retval; + ::DDS_PublicationMatchedStatus rtistatus; + ::DDS::ReturnCode_t const retval = this->impl ()->get_publication_matched_status (rtistatus); + rtistatus >>= status; + return retval; #else - return this->impl ()->get_publication_matched_status (status); + return this->impl ()->get_publication_matched_status (status); #endif - } + } - ::DDS::ReturnCode_t - RTI_DataWriter_i::assert_liveliness (void) - { - return this->impl ()->assert_liveliness (); - } + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::assert_liveliness (void) + { + return this->impl ()->assert_liveliness (); + } - ::DDS::ReturnCode_t - RTI_DataWriter_i::get_matched_subscriptions (::DDS::InstanceHandleSeq & subscription_handles) - { + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::get_matched_subscriptions (::DDS::InstanceHandleSeq & subscription_handles) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandleSeq rtiseq; - ::DDS::ReturnCode_t const retval = this->impl ()->get_matched_subscriptions (rtiseq); - rtiseq >>= subscription_handles; - return retval; + ::DDS_InstanceHandleSeq rtiseq; + ::DDS::ReturnCode_t const retval = this->impl ()->get_matched_subscriptions (rtiseq); + rtiseq >>= subscription_handles; + return retval; #else - return this->impl ()->get_matched_subscriptions (subscription_handles); + return this->impl ()->get_matched_subscriptions (subscription_handles); #endif - } + } - ::DDS::ReturnCode_t - RTI_DataWriter_i::get_matched_subscription_data (::DDS::SubscriptionBuiltinTopicData & subscription_data, - DDS_INSTANCE_HANDLE_T_IN subscription_handle) - { - DDS4CCM_TRACE ("RTI_DataWriter_i::get_matched_subscription_data"); + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::get_matched_subscription_data (::DDS::SubscriptionBuiltinTopicData & subscription_data, + DDS_INSTANCE_HANDLE_T_IN subscription_handle) + { + DDS4CCM_TRACE ("CCM_DDS_DataWriter_i::get_matched_subscription_data"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ACE_UNUSED_ARG (subscription_data); - ACE_UNUSED_ARG (subscription_handle); - throw CORBA::NO_IMPLEMENT (); - // Add your implementation here + ACE_UNUSED_ARG (subscription_data); + ACE_UNUSED_ARG (subscription_handle); + throw CORBA::NO_IMPLEMENT (); + // Add your implementation here #else - return this->impl ()->get_matched_subscription_data (subscription_data, subscription_handle); + return this->impl ()->get_matched_subscription_data (subscription_data, subscription_handle); #endif - } + } - ::DDS::ReturnCode_t - RTI_DataWriter_i::enable (void) - { - return this->impl ()->enable (); - } + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::enable (void) + { + return this->impl ()->enable (); + } - ::DDS::StatusCondition_ptr - RTI_DataWriter_i::get_statuscondition (void) - { - ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); + ::DDS::StatusCondition_ptr + CCM_DDS_DataWriter_i::get_statuscondition (void) + { + ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSStatusCondition* sc = this->impl ()->get_statuscondition (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc), - CORBA::NO_MEMORY ()); + DDSStatusCondition* sc = this->impl ()->get_statuscondition (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc), + CORBA::NO_MEMORY ()); #else - ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc.in ()), - CORBA::NO_MEMORY ()); + ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc.in ()), + CORBA::NO_MEMORY ()); #endif - return retval._retn (); - } + return retval._retn (); + } - ::DDS::StatusMask - RTI_DataWriter_i::get_status_changes (void) - { - return this->impl ()->get_status_changes (); - } + ::DDS::StatusMask + CCM_DDS_DataWriter_i::get_status_changes (void) + { + return this->impl ()->get_status_changes (); + } - DDS_INSTANCE_HANDLE_T_RETN - RTI_DataWriter_i::get_instance_handle (void) - { + DDS_INSTANCE_HANDLE_T_RETN + CCM_DDS_DataWriter_i::get_instance_handle (void) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); - ::DDS::InstanceHandle_t handle; - handle <<= rtihandle; - return handle; + ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); + ::DDS::InstanceHandle_t handle; + handle <<= rtihandle; + return handle; #else - return this->impl ()->get_instance_handle (); + return this->impl ()->get_instance_handle (); #endif - } - - DDSDataWriter * - RTI_DataWriter_i::get_impl (void) - { - return this->impl_; - } + } - void - RTI_DataWriter_i::set_impl (DDSDataWriter * dw) - { - this->impl_ = dw; - } + DDSDataWriter * + CCM_DDS_DataWriter_i::get_impl (void) + { + return this->impl_; + } - DDSDataWriter * - RTI_DataWriter_i::impl (void) - { - if (!this->impl_) - { - throw ::CORBA::BAD_INV_ORDER (); - } - return this->impl_; - } + void + CCM_DDS_DataWriter_i::set_impl (DDSDataWriter * dw) + { + this->impl_ = dw; + } + DDSDataWriter * + CCM_DDS_DataWriter_i::impl (void) + { + if (!this->impl_) + { + throw ::CORBA::BAD_INV_ORDER (); + } + return this->impl_; } } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h index 89e72680c1b..3f731148fc6 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h @@ -30,85 +30,82 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DataWriter_i + : public virtual ::DDS::CCM_DataWriter, + public virtual ::CORBA::LocalObject { - class DDS4CCM_NDDS_IMPL_Export RTI_DataWriter_i - : public virtual ::DDS::CCM_DataWriter, - public virtual ::CORBA::LocalObject - { - public: - // Constructor - RTI_DataWriter_i (void); + public: + /// Constructor + CCM_DDS_DataWriter_i (void); - // Destructor - virtual ~RTI_DataWriter_i (void); + /// Destructor + virtual ~CCM_DDS_DataWriter_i (void); - virtual - ::DDS::ReturnCode_t set_qos (const ::DDS::DataWriterQos & qos); + virtual + ::DDS::ReturnCode_t set_qos (const ::DDS::DataWriterQos & qos); - virtual - ::DDS::ReturnCode_t get_qos (::DDS::DataWriterQos & qos); + virtual + ::DDS::ReturnCode_t get_qos (::DDS::DataWriterQos & qos); - virtual - ::DDS::ReturnCode_t set_listener (::DDS::DataWriterListener_ptr a_listener, - ::DDS::StatusMask mask); + virtual + ::DDS::ReturnCode_t set_listener (::DDS::DataWriterListener_ptr a_listener, + ::DDS::StatusMask mask); - virtual - ::DDS::DataWriterListener_ptr get_listener (void); + virtual + ::DDS::DataWriterListener_ptr get_listener (void); - virtual - ::DDS::Topic_ptr get_topic (void); + virtual + ::DDS::Topic_ptr get_topic (void); - virtual - ::DDS::Publisher_ptr get_publisher (void); + virtual + ::DDS::Publisher_ptr get_publisher (void); - virtual - ::DDS::ReturnCode_t wait_for_acknowledgments (const ::DDS::Duration_t & max_wait); + virtual + ::DDS::ReturnCode_t wait_for_acknowledgments (const ::DDS::Duration_t & max_wait); - virtual - ::DDS::ReturnCode_t get_liveliness_lost_status (::DDS::LivelinessLostStatus & status); + virtual + ::DDS::ReturnCode_t get_liveliness_lost_status (::DDS::LivelinessLostStatus & status); - virtual - ::DDS::ReturnCode_t get_offered_deadline_missed_status (::DDS::OfferedDeadlineMissedStatus & status); + virtual + ::DDS::ReturnCode_t get_offered_deadline_missed_status (::DDS::OfferedDeadlineMissedStatus & status); - virtual - ::DDS::ReturnCode_t get_offered_incompatible_qos_status (::DDS::OfferedIncompatibleQosStatus & status); + virtual + ::DDS::ReturnCode_t get_offered_incompatible_qos_status (::DDS::OfferedIncompatibleQosStatus & status); - virtual - ::DDS::ReturnCode_t get_publication_matched_status (::DDS::PublicationMatchedStatus & status); + virtual + ::DDS::ReturnCode_t get_publication_matched_status (::DDS::PublicationMatchedStatus & status); - virtual - ::DDS::ReturnCode_t assert_liveliness (void); + virtual + ::DDS::ReturnCode_t assert_liveliness (void); - virtual - ::DDS::ReturnCode_t get_matched_subscriptions (::DDS::InstanceHandleSeq & subscription_handles); + virtual + ::DDS::ReturnCode_t get_matched_subscriptions (::DDS::InstanceHandleSeq & subscription_handles); - virtual - ::DDS::ReturnCode_t get_matched_subscription_data (::DDS::SubscriptionBuiltinTopicData & subscription_data, - DDS_INSTANCE_HANDLE_T_IN subscription_handle); + virtual + ::DDS::ReturnCode_t get_matched_subscription_data (::DDS::SubscriptionBuiltinTopicData & subscription_data, + DDS_INSTANCE_HANDLE_T_IN subscription_handle); - virtual - ::DDS::ReturnCode_t enable (void); + virtual + ::DDS::ReturnCode_t enable (void); - virtual - ::DDS::StatusCondition_ptr get_statuscondition (void); + virtual + ::DDS::StatusCondition_ptr get_statuscondition (void); - virtual - ::DDS::StatusMask get_status_changes (void); + virtual + ::DDS::StatusMask get_status_changes (void); - virtual - DDS_INSTANCE_HANDLE_T_RETN get_instance_handle (void); + virtual + DDS_INSTANCE_HANDLE_T_RETN get_instance_handle (void); - DDSDataWriter * get_impl (void); + DDSDataWriter * get_impl (void); - void set_impl (DDSDataWriter * dw); + void set_impl (DDSDataWriter * dw); - private: - DDSDataWriter * impl_; + private: + DDSDataWriter * impl_; - DDSDataWriter * impl (void); - }; - } + DDSDataWriter * impl (void); + }; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp index 4883dcbd755..dcface51af7 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp @@ -11,94 +11,91 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + CCM_DDS_DataWriterListener_i::CCM_DDS_DataWriterListener_i (::DDS::DataWriterListener_ptr s) + : impl_ (::DDS::DataWriterListener::_duplicate (s)) { - RTI_DataWriterListener_i::RTI_DataWriterListener_i (::DDS::DataWriterListener_ptr s) - : impl_ (::DDS::DataWriterListener::_duplicate (s)) - { - } + } - RTI_DataWriterListener_i::~RTI_DataWriterListener_i (void) - { - } + CCM_DDS_DataWriterListener_i::~CCM_DDS_DataWriterListener_i (void) + { + } - void - RTI_DataWriterListener_i::on_offered_deadline_missed ( - ::DDSDataWriter *the_writer, - const ::DDS_OfferedDeadlineMissedStatus & status) - { + void + CCM_DDS_DataWriterListener_i::on_offered_deadline_missed ( + ::DDSDataWriter *the_writer, + const ::DDS_OfferedDeadlineMissedStatus & status) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::OfferedDeadlineMissedStatus ddsstatus; - ddsstatus <<= status; - ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); - ACE_NEW (dds_writer, RTI_DataWriter_i ()); - RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ()); - dw->set_impl (the_writer); - this->impl_->on_offered_deadline_missed (dds_writer.in (), ddsstatus); + ::DDS::OfferedDeadlineMissedStatus ddsstatus; + ddsstatus <<= status; + ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); + ACE_NEW (dds_writer, CCM_DDS_DataWriter_i ()); + CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (dds_writer.in ()); + dw->set_impl (the_writer); + this->impl_->on_offered_deadline_missed (dds_writer.in (), ddsstatus); #else - this->impl_->on_offered_deadline_missed (the_writer, status); + this->impl_->on_offered_deadline_missed (the_writer, status); #endif - } + } - void - RTI_DataWriterListener_i::on_offered_incompatible_qos ( - ::DDSDataWriter *the_writer, - const ::DDS_OfferedIncompatibleQosStatus & status) - { + void + CCM_DDS_DataWriterListener_i::on_offered_incompatible_qos ( + ::DDSDataWriter *the_writer, + const ::DDS_OfferedIncompatibleQosStatus & status) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::OfferedIncompatibleQosStatus ddsstatus; - ddsstatus <<= status; - ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); - ACE_NEW (dds_writer, RTI_DataWriter_i ()); - RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ()); - dw->set_impl (the_writer); - this->impl_->on_offered_incompatible_qos (dds_writer.in (), ddsstatus); + ::DDS::OfferedIncompatibleQosStatus ddsstatus; + ddsstatus <<= status; + ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); + ACE_NEW (dds_writer, CCM_DDS_DataWriter_i ()); + CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (dds_writer.in ()); + dw->set_impl (the_writer); + this->impl_->on_offered_incompatible_qos (dds_writer.in (), ddsstatus); #else - this->impl_->on_offered_incompatible_qos (the_writer, status); + this->impl_->on_offered_incompatible_qos (the_writer, status); #endif - } + } - void - RTI_DataWriterListener_i::on_liveliness_lost ( - ::DDSDataWriter *the_writer, - const ::DDS_LivelinessLostStatus & status) - { + void + CCM_DDS_DataWriterListener_i::on_liveliness_lost ( + ::DDSDataWriter *the_writer, + const ::DDS_LivelinessLostStatus & status) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::LivelinessLostStatus ddsstatus; - ddsstatus <<= status; - ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); - ACE_NEW (dds_writer, RTI_DataWriter_i ()); - RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ()); - dw->set_impl (the_writer); - this->impl_->on_liveliness_lost (dds_writer.in (), ddsstatus); + ::DDS::LivelinessLostStatus ddsstatus; + ddsstatus <<= status; + ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); + ACE_NEW (dds_writer, CCM_DDS_DataWriter_i ()); + CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (dds_writer.in ()); + dw->set_impl (the_writer); + this->impl_->on_liveliness_lost (dds_writer.in (), ddsstatus); #else - this->impl_->on_liveliness_lost (the_writer, status); + this->impl_->on_liveliness_lost (the_writer, status); #endif - } + } - void - RTI_DataWriterListener_i::on_publication_matched ( - ::DDSDataWriter *the_writer, - const ::DDS_PublicationMatchedStatus & status) - { + void + CCM_DDS_DataWriterListener_i::on_publication_matched ( + ::DDSDataWriter *the_writer, + const ::DDS_PublicationMatchedStatus & status) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::PublicationMatchedStatus ddsstatus; - ddsstatus <<= status; - ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); - ACE_NEW (dds_writer, RTI_DataWriter_i ()); - RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ()); - dw->set_impl (the_writer); - this->impl_->on_publication_matched (dds_writer.in (), ddsstatus); + ::DDS::PublicationMatchedStatus ddsstatus; + ddsstatus <<= status; + ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); + ACE_NEW (dds_writer, CCM_DDS_DataWriter_i ()); + CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (dds_writer.in ()); + dw->set_impl (the_writer); + this->impl_->on_publication_matched (dds_writer.in (), ddsstatus); #else - this->impl_->on_publication_matched (the_writer, status); + this->impl_->on_publication_matched (the_writer, status); #endif - } + } - ::DDS::DataWriterListener_ptr - RTI_DataWriterListener_i::get_datawriterlistener (void) - { - return ::DDS::DataWriterListener::_duplicate (this->impl_.in ()); - } + ::DDS::DataWriterListener_ptr + CCM_DDS_DataWriterListener_i::get_datawriterlistener (void) + { + return ::DDS::DataWriterListener::_duplicate (this->impl_.in ()); } } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h index 7609eff7253..fd22b9a76fa 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h @@ -34,39 +34,36 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DataWriterListener_i : + public virtual ::DDSDataWriterListener { - class DDS4CCM_NDDS_IMPL_Export RTI_DataWriterListener_i : - public virtual ::DDSDataWriterListener - { - public: - // Constructor - RTI_DataWriterListener_i (::DDS::DataWriterListener_ptr p); + public: + /// Constructor + CCM_DDS_DataWriterListener_i (::DDS::DataWriterListener_ptr p); - // Destructor - virtual ~RTI_DataWriterListener_i (void); + /// Destructor + virtual ~CCM_DDS_DataWriterListener_i (void); - virtual void on_offered_deadline_missed ( - ::DDSDataWriter *the_writer, - const ::DDS_OfferedDeadlineMissedStatus & status); + virtual void on_offered_deadline_missed ( + ::DDSDataWriter *the_writer, + const ::DDS_OfferedDeadlineMissedStatus & status); - virtual void on_offered_incompatible_qos ( - ::DDSDataWriter *the_writer, - const ::DDS_OfferedIncompatibleQosStatus & status); + virtual void on_offered_incompatible_qos ( + ::DDSDataWriter *the_writer, + const ::DDS_OfferedIncompatibleQosStatus & status); - virtual void on_liveliness_lost ( - ::DDSDataWriter *the_writer, - const ::DDS_LivelinessLostStatus & status); + virtual void on_liveliness_lost ( + ::DDSDataWriter *the_writer, + const ::DDS_LivelinessLostStatus & status); - virtual void on_publication_matched ( - ::DDSDataWriter *the_writer, - const ::DDS_PublicationMatchedStatus & status); + virtual void on_publication_matched ( + ::DDSDataWriter *the_writer, + const ::DDS_PublicationMatchedStatus & status); - ::DDS::DataWriterListener_ptr get_datawriterlistener (void); - private: - ::DDS::DataWriterListener_var impl_; - }; - } + ::DDS::DataWriterListener_ptr get_datawriterlistener (void); + private: + ::DDS::DataWriterListener_var impl_; + }; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp index 0699efb27b3..28451f3a178 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp @@ -26,939 +26,939 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + CCM_DDS_DomainParticipant_i::CCM_DDS_DomainParticipant_i ( + DDSDomainParticipant * dp) : impl_ (dp) { - RTI_DomainParticipant_i::RTI_DomainParticipant_i (void) - : impl_ (0) - { - DDS4CCM_TRACE ("RTI_DomainParticipant_i::RTI_DomainParticipant_i"); - } + DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_i::CCM_DDS_DomainParticipant_i"); + } - RTI_DomainParticipant_i::~RTI_DomainParticipant_i (void) - { - DDS4CCM_TRACE ("RTI_DomainParticipant_i::~RTI_DomainParticipant_i"); - } + CCM_DDS_DomainParticipant_i::~CCM_DDS_DomainParticipant_i (void) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_i::~CCM_DDS_DomainParticipant_i"); + } #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::Publisher_ptr - RTI_DomainParticipant_i::create_publisher_with_profile ( - const char* library_name, - const char *profile_name, - ::DDS::PublisherListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_publisher_with_profile"); - - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipant_i::create_publisher_with_profile - " - "Creating Publisher\n")); - ::DDS::Publisher_var retval = ::DDS::Publisher::_nil (); - ACE_NEW_THROW_EX (retval, - RTI_Publisher_i (), - CORBA::NO_MEMORY ()); - - RTI_PublisherListener_i *rti_pl = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (rti_pl, - RTI_PublisherListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - DDSPublisher * rti_pub = - this->impl ()->create_publisher_with_profile (library_name, - profile_name, - rti_pl, - mask); - - if (!rti_pub) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::create_publisher_with_profile - " - "Error: Unable to create Publisher\n")); - delete rti_pl; - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - - DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "RTI_DomainParticipant_i::create_publisher_with_profile - " - "Successfully created a DDSPublisher\n")); - - rti_pub->enable (); - RTI_Publisher_i *rti_p = dynamic_cast < RTI_Publisher_i *> (retval.in ()); - rti_p->set_impl (rti_pub); - - return retval._retn (); - } + ::DDS::Publisher_ptr + CCM_DDS_DomainParticipant_i::create_publisher_with_profile ( + const char* library_name, + const char *profile_name, + ::DDS::PublisherListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_publisher_with_profile"); + + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher_with_profile - " + "Creating Publisher\n")); + CCM_DDS_PublisherListener_i *rti_pl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_pl, + CCM_DDS_PublisherListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + DDSPublisher * rti_pub = + this->impl ()->create_publisher_with_profile (library_name, + profile_name, + rti_pl, + mask); + + if (!rti_pub) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher_with_profile - " + "Error: Unable to create Publisher\n")); + delete rti_pl; + throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + } + + ::DDS::Publisher_var retval = ::DDS::Publisher::_nil (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_Publisher_i (rti_pub), + CORBA::NO_MEMORY ()); + + + DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher_with_profile - " + "Successfully created a DDSPublisher\n")); + + rti_pub->enable (); + CCM_DDS_Publisher_i *rti_p = dynamic_cast < CCM_DDS_Publisher_i *> (retval.in ()); + rti_p->set_impl (rti_pub); + + return retval._retn (); + } #endif - ::DDS::Publisher_ptr - RTI_DomainParticipant_i::create_publisher ( - const ::DDS::PublisherQos & qos, - ::DDS::PublisherListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_publisher"); + ::DDS::Publisher_ptr + CCM_DDS_DomainParticipant_i::create_publisher ( + const ::DDS::PublisherQos & qos, + ::DDS::PublisherListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_publisher"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ACE_UNUSED_ARG (qos); + ACE_UNUSED_ARG (qos); - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipant_i::create_publisher - " - "Creating Publisher\n")); + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher - " + "Creating Publisher\n")); - DDS_PublisherQos rti_qos = DDS_PUBLISHER_QOS_DEFAULT; + DDS_PublisherQos rti_qos = DDS_PUBLISHER_QOS_DEFAULT; - ::DDS::Publisher_var retval = ::DDS::Publisher::_nil (); - ACE_NEW_THROW_EX (retval, - RTI_Publisher_i (), - CORBA::NO_MEMORY ()); + CCM_DDS_PublisherListener_i *rti_pl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_pl, + CCM_DDS_PublisherListener_i (a_listener), + CORBA::NO_MEMORY ()); + } - RTI_PublisherListener_i *rti_pl = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (rti_pl, - RTI_PublisherListener_i (a_listener), - CORBA::NO_MEMORY ()); - } + DDSPublisher * rti_pub = + this->impl ()->create_publisher (rti_qos, + rti_pl, + mask); - DDSPublisher * rti_pub = - this->impl ()->create_publisher (rti_qos, - rti_pl, - mask); + if (!rti_pub) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher - " + "Error: Unable to create Publisher\n")); + throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + } - if (!rti_pub) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::create_publisher - " - "Error: Unable to create Publisher\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } + ::DDS::Publisher_var retval = ::DDS::Publisher::_nil (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_Publisher_i (rti_pub), + CORBA::NO_MEMORY ()); - DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "RTI_DomainParticipant_i::create_publisher - " - "Successfully created a DDSPublisher\n")); - rti_pub->enable (); - RTI_Publisher_i *rti_p = dynamic_cast < RTI_Publisher_i *> (retval.in ()); - rti_p->set_impl (rti_pub); + DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher - " + "Successfully created a DDSPublisher\n")); - return retval._retn (); + rti_pub->enable (); + CCM_DDS_Publisher_i *rti_p = dynamic_cast < CCM_DDS_Publisher_i *> (retval.in ()); + rti_p->set_impl (rti_pub); + + return retval._retn (); #else - return this->impl ()->create_publisher (qos, a_listener, mask); + return this->impl ()->create_publisher (qos, a_listener, mask); #endif - } + } - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::delete_publisher (::DDS::Publisher_ptr p) - { + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::delete_publisher (::DDS::Publisher_ptr p) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - RTI_Publisher_i *rti_pub = dynamic_cast < RTI_Publisher_i * > (p); - - if (!rti_pub) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::delete_publisher - " - "Unable to cast provided object refence to servant pointer.\n")); - return ::DDS::RETCODE_ERROR; - } - - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipant_i::delete_publisher - " - "Successfully casted provided object refence to RTI_Publisher_i\n")); - - DDS_ReturnCode_t const retval = this->impl ()->delete_publisher (rti_pub->get_impl ()); - - if (retval != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::delete_publisher - " - "Error: RTI delete_publisher returned non-ok error code %C\n", - translate_retcode (retval))); - } - else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "RTI_DomainParticipant_i::delete_publisher - " - "Provided publisher successfully deleted\n")); - - return retval; + CCM_DDS_Publisher_i *rti_pub = dynamic_cast < CCM_DDS_Publisher_i * > (p); + + if (!rti_pub) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_publisher - " + "Unable to cast provided object refence to servant pointer.\n")); + return ::DDS::RETCODE_ERROR; + } + + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::delete_publisher - " + "Successfully casted provided object refence to CCM_DDS_Publisher_i\n")); + + DDS_ReturnCode_t const retval = this->impl ()->delete_publisher (rti_pub->get_impl ()); + + if (retval != DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_publisher - " + "Error: RTI delete_publisher returned non-ok error code %C\n", + translate_retcode (retval))); + } + else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::delete_publisher - " + "Provided publisher successfully deleted\n")); + + return retval; #else - return this->impl ()->delete_publisher (p); + return this->impl ()->delete_publisher (p); #endif - } + } #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::Subscriber_ptr - RTI_DomainParticipant_i::create_subscriber_with_profile ( - const char* library_name, - const char *profile_name, - ::DDS::SubscriberListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_subscriber_with_profile"); - - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipant_i::create_subscriber_with_profile - " - "Creating Subscriber\n")); - - ::DDS::Subscriber_var retval = ::DDS::Subscriber::_nil (); - ACE_NEW_THROW_EX (retval, - RTI_Subscriber_i (), - CORBA::NO_MEMORY ()); - - RTI_SubscriberListener_i *rti_sl = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (rti_sl, - RTI_SubscriberListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - DDSSubscriber * rti_sub = - this->impl ()->create_subscriber_with_profile ( - library_name, - profile_name, - rti_sl, - mask); - - if (!rti_sub) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::create_subscriber_with_profile - " - "Error: Unable to create Subscriber\n")); - delete rti_sl; - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - - DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "RTI_DomainParticipant_i::create_subscriber_with_profile - " - "Successfully created a DDSSubscriber\n")); - - rti_sub->enable (); - RTI_Subscriber_i *rti_s = dynamic_cast < RTI_Subscriber_i *> (retval.in ()); - rti_s->set_impl (rti_sub); - - return retval._retn (); - } + ::DDS::Subscriber_ptr + CCM_DDS_DomainParticipant_i::create_subscriber_with_profile ( + const char* library_name, + const char *profile_name, + ::DDS::SubscriberListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_subscriber_with_profile"); + + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber_with_profile - " + "Creating Subscriber\n")); + + CCM_DDS_SubscriberListener_i *rti_sl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_sl, + CCM_DDS_SubscriberListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + DDSSubscriber * rti_sub = + this->impl ()->create_subscriber_with_profile ( + library_name, + profile_name, + rti_sl, + mask); + + if (!rti_sub) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber_with_profile - " + "Error: Unable to create Subscriber\n")); + delete rti_sl; + throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + } + + ::DDS::Subscriber_var retval = ::DDS::Subscriber::_nil (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_Subscriber_i (rti_sub), + CORBA::NO_MEMORY ()); + + DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber_with_profile - " + "Successfully created a DDSSubscriber\n")); + + rti_sub->enable (); + CCM_DDS_Subscriber_i *rti_s = dynamic_cast < CCM_DDS_Subscriber_i *> (retval.in ()); + rti_s->set_impl (rti_sub); + + return retval._retn (); + } #endif - ::DDS::Subscriber_ptr - RTI_DomainParticipant_i::create_subscriber (const ::DDS::SubscriberQos & qos, - ::DDS::SubscriberListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_subscriber"); + ::DDS::Subscriber_ptr + CCM_DDS_DomainParticipant_i::create_subscriber (const ::DDS::SubscriberQos & qos, + ::DDS::SubscriberListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_subscriber"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ACE_UNUSED_ARG (qos); - - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipant_i::create_subscriber - " - "Creating Subscriber\n")); - - ::DDS::Subscriber_var retval = ::DDS::Subscriber::_nil (); - ACE_NEW_THROW_EX (retval, - RTI_Subscriber_i (), - CORBA::NO_MEMORY ()); - - RTI_SubscriberListener_i *rti_sl = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (rti_sl, - RTI_SubscriberListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - DDSSubscriber * rti_sub = - this->impl ()->create_subscriber (DDS_SUBSCRIBER_QOS_DEFAULT, - rti_sl, - mask); - - if (!rti_sub) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::create_subscriber - " - "Error: Unable to create Subscriber\n")); - delete rti_sl; - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - - DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "RTI_DomainParticipant_i::create_subscriber - " - "Successfully created a DDSSubscriber\n")); - - rti_sub->enable (); - RTI_Subscriber_i *rti_s = dynamic_cast < RTI_Subscriber_i *> (retval.in ()); - rti_s->set_impl (rti_sub); - - return retval._retn (); + ACE_UNUSED_ARG (qos); + + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber - " + "Creating Subscriber\n")); + + CCM_DDS_SubscriberListener_i *rti_sl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_sl, + CCM_DDS_SubscriberListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + DDSSubscriber * rti_sub = + this->impl ()->create_subscriber (DDS_SUBSCRIBER_QOS_DEFAULT, + rti_sl, + mask); + + if (!rti_sub) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber - " + "Error: Unable to create Subscriber\n")); + delete rti_sl; + throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + } + + ::DDS::Subscriber_var retval = ::DDS::Subscriber::_nil (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_Subscriber_i (rti_sub), + CORBA::NO_MEMORY ()); + + DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber - " + "Successfully created a DDSSubscriber\n")); + + rti_sub->enable (); + CCM_DDS_Subscriber_i *rti_s = dynamic_cast < CCM_DDS_Subscriber_i *> (retval.in ()); + rti_s->set_impl (rti_sub); + + return retval._retn (); #else - return this->impl ()->create_subscriber (qos, - a_listener, - mask); + return this->impl ()->create_subscriber (qos, + a_listener, + mask); #endif - } + } - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::delete_subscriber (::DDS::Subscriber_ptr s) - { + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::delete_subscriber (::DDS::Subscriber_ptr s) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - RTI_Subscriber_i *rti_sub = dynamic_cast < RTI_Subscriber_i * > (s); - - if (!rti_sub) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::delete_subscriber - " - "Unable to cast provided object refence to servant pointer.\n")); - return ::DDS::RETCODE_ERROR; - } - - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipant_i::delete_subscriber - " - "Successfully casted provided object refence to RTI_Subscriber_i\n")); - - DDS_ReturnCode_t const retval = this->impl ()->delete_subscriber (rti_sub->get_impl ()); - - if (retval != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::delete_subscriber - " - "Error: RTI delete_subscriber returned non-ok error code %C\n", - translate_retcode (retval))); - } - else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "RTI_DomainParticipant_i::delete_subscriber - " - "Provided subscriber successfully deleted\n")); - - return retval; + CCM_DDS_Subscriber_i *rti_sub = dynamic_cast < CCM_DDS_Subscriber_i * > (s); + + if (!rti_sub) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_subscriber - " + "Unable to cast provided object refence to servant pointer.\n")); + return ::DDS::RETCODE_ERROR; + } + + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::delete_subscriber - " + "Successfully casted provided object refence to CCM_DDS_Subscriber_i\n")); + + DDS_ReturnCode_t const retval = this->impl ()->delete_subscriber (rti_sub->get_impl ()); + + if (retval != DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_subscriber - " + "Error: RTI delete_subscriber returned non-ok error code %C\n", + translate_retcode (retval))); + } + else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::delete_subscriber - " + "Provided subscriber successfully deleted\n")); + + return retval; #else - return this->impl ()->delete_subscriber (s); + return this->impl ()->delete_subscriber (s); #endif - } + } - ::DDS::Subscriber_ptr - RTI_DomainParticipant_i::get_builtin_subscriber (void) - { + ::DDS::Subscriber_ptr + CCM_DDS_DomainParticipant_i::get_builtin_subscriber (void) + { + ::DDS::Subscriber_var retval = ::DDS::Subscriber::_nil (); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::Subscriber_var retval = ::DDS::Subscriber::_nil (); - ACE_NEW_THROW_EX (retval, - RTI_Subscriber_i (), - CORBA::NO_MEMORY ()); - - DDSSubscriber* rti_sub = this->impl ()->get_builtin_subscriber (); - RTI_Subscriber_i *rti_s = dynamic_cast < RTI_Subscriber_i *> (retval.in ()); - rti_s->set_impl (rti_sub); - return retval._retn (); + DDSSubscriber* sub = this->impl ()->get_builtin_subscriber (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_Subscriber_i (sub), + CORBA::NO_MEMORY ()); #else - return this->impl ()->get_builtin_subscriber (); + ::DDS::Subscriber_var sub = this->impl ()->get_builtin_subscriber (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_Subscriber_i (sub.in ()), + CORBA::NO_MEMORY ()); #endif - } + return retval._retn (); + } - ::DDS::Topic_ptr - RTI_DomainParticipant_i::create_topic (const char * impl_name, - const char * type_name, - const ::DDS::TopicQos & qos, - ::DDS::TopicListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_topic"); + ::DDS::Topic_ptr + CCM_DDS_DomainParticipant_i::create_topic (const char * impl_name, + const char * type_name, + const ::DDS::TopicQos & qos, + ::DDS::TopicListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_topic"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ACE_UNUSED_ARG (qos); - - if (impl_name == 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - " - "Error: provided nil topic name\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, - 0); - } - - if (type_name == 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - " - "Error: provided nil type name\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, - 0); - } - - DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "DDS_DomainParticipant_i::create_topic - " - "Attempting to create topic with name %C and type %C\n", - impl_name, type_name)); - - CCM_DDS_TopicListener_i *rti_tl = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (rti_tl, - CCM_DDS_TopicListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - - DDSTopic *rti_topic = this->impl ()->create_topic (impl_name, - type_name, - DDS_TOPIC_QOS_DEFAULT, - rti_tl, - mask); - - if (rti_topic == 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - " - "Error: RTI DDS returned a nil topic\n")); - delete rti_tl; - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - - ::DDS::Topic_var retval = ::DDS::Topic::_nil (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_Topic_i (rti_topic), - CORBA::NO_MEMORY ()); - - DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_topic - " - "Successfully created topic with name %C and type %C\n", - impl_name, type_name)); - - CCM_DDS_Topic_i *tp = dynamic_cast < CCM_DDS_Topic_i *> (retval.in ()); - tp->set_impl (rti_topic); - - return retval._retn (); + ACE_UNUSED_ARG (qos); + + if (impl_name == 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - " + "Error: provided nil topic name\n")); + throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, + 0); + } + + if (type_name == 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - " + "Error: provided nil type name\n")); + throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, + 0); + } + + DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "DDS_DomainParticipant_i::create_topic - " + "Attempting to create topic with name %C and type %C\n", + impl_name, type_name)); + + CCM_DDS_TopicListener_i *rti_tl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_tl, + CCM_DDS_TopicListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + + DDSTopic *rti_topic = this->impl ()->create_topic (impl_name, + type_name, + DDS_TOPIC_QOS_DEFAULT, + rti_tl, + mask); + + if (rti_topic == 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - " + "Error: RTI DDS returned a nil topic\n")); + delete rti_tl; + throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + } + + ::DDS::Topic_var retval = ::DDS::Topic::_nil (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_Topic_i (rti_topic), + CORBA::NO_MEMORY ()); + + DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_topic - " + "Successfully created topic with name %C and type %C\n", + impl_name, type_name)); + + CCM_DDS_Topic_i *tp = dynamic_cast < CCM_DDS_Topic_i *> (retval.in ()); + tp->set_impl (rti_topic); + + return retval._retn (); #else - return this->impl ()->create_topic (impl_name, - type_name, - qos, - a_listener, - mask); + return this->impl ()->create_topic (impl_name, + type_name, + qos, + a_listener, + mask); #endif - } + } #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::Topic_ptr - RTI_DomainParticipant_i::create_topic_with_profile ( - const char *impl_name, - const char *type_name, - const char *library_name, - const char *profile_name, - ::DDS::TopicListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_topic_with_profile"); - - if (impl_name == 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " - "Error: provided nil topic name\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); - } - - if (type_name == 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " - "Error: provided nil type name\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); - } - - DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " - "Attempting to create topic with name %C and type %C\n", - impl_name, type_name)); - - ::DDS::Duration_t dur = { 0, 1000000 }; - ::DDS::Topic_var tp = this->find_topic (impl_name, dur); - if (CORBA::is_nil (tp)) - { - CCM_DDS_TopicListener_i *rti_tl = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (rti_tl, - CCM_DDS_TopicListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - DDSTopic *rti_topic = this->impl ()->create_topic_with_profile (impl_name, - type_name, - library_name, - profile_name, - rti_tl, - mask); - - if (rti_topic == 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " - "Error: RTI DDS returned a nil topic\n")); - delete rti_tl; - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - - ::DDS::Topic_var retval = ::DDS::Topic::_nil (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_Topic_i (rti_topic), - CORBA::NO_MEMORY ()); - - DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " - "Successfully created topic with name %C and type %C\n", - impl_name, type_name)); - - CCM_DDS_Topic_i *tp = dynamic_cast < CCM_DDS_Topic_i *> (retval.in ()); - tp->set_impl (rti_topic); - - return retval._retn (); - } - else - { - DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " - "Re-using topic with name %C and type %C.\n", - impl_name, type_name)); - return ::DDS::Topic::_duplicate (tp.in ()); - } - } + ::DDS::Topic_ptr + CCM_DDS_DomainParticipant_i::create_topic_with_profile ( + const char *impl_name, + const char *type_name, + const char *library_name, + const char *profile_name, + ::DDS::TopicListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_topic_with_profile"); + + if (impl_name == 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " + "Error: provided nil topic name\n")); + throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); + } + + if (type_name == 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " + "Error: provided nil type name\n")); + throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); + } + + DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " + "Attempting to create topic with name %C and type %C\n", + impl_name, type_name)); + + ::DDS::Duration_t dur = { 0, 1000000 }; + ::DDS::Topic_var tp = this->find_topic (impl_name, dur); + if (CORBA::is_nil (tp)) + { + CCM_DDS_TopicListener_i *rti_tl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_tl, + CCM_DDS_TopicListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + DDSTopic *rti_topic = this->impl ()->create_topic_with_profile (impl_name, + type_name, + library_name, + profile_name, + rti_tl, + mask); + + if (rti_topic == 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " + "Error: RTI DDS returned a nil topic\n")); + delete rti_tl; + throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + } + + ::DDS::Topic_var retval = ::DDS::Topic::_nil (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_Topic_i (rti_topic), + CORBA::NO_MEMORY ()); + + DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " + "Successfully created topic with name %C and type %C\n", + impl_name, type_name)); + + CCM_DDS_Topic_i *tp = dynamic_cast < CCM_DDS_Topic_i *> (retval.in ()); + tp->set_impl (rti_topic); + + return retval._retn (); + } + else + { + DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " + "Re-using topic with name %C and type %C.\n", + impl_name, type_name)); + return ::DDS::Topic::_duplicate (tp.in ()); + } + } #endif - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::delete_topic (::DDS::Topic_ptr a_topic) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_topic"); + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::delete_topic (::DDS::Topic_ptr a_topic) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_topic"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - CCM_DDS_Topic_i *top = dynamic_cast< CCM_DDS_Topic_i *> (a_topic); - - if (top == 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::delete_topic - " - "Unable to cast provided object reference to servant.\n")); - return ::DDS::RETCODE_BAD_PARAMETER; - } - - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipant_i::delete_topic - " - "Successfully casted provided object reference to servant.\n")); - - DDS_ReturnCode_t const retval = this->impl ()->delete_topic (top->get_impl ()); - - if (retval != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::delete_topic - " - "Error: RTI delete_topic returned non-ok error code %C\n", - translate_retcode (retval))); - } - else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "RTI_DomainParticipant_i::delete_topic - " - "Provided topic successfully deleted\n")); - - return retval; + CCM_DDS_Topic_i *top = dynamic_cast< CCM_DDS_Topic_i *> (a_topic); + + if (top == 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_topic - " + "Unable to cast provided object reference to servant.\n")); + return ::DDS::RETCODE_BAD_PARAMETER; + } + + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::delete_topic - " + "Successfully casted provided object reference to servant.\n")); + + DDS_ReturnCode_t const retval = this->impl ()->delete_topic (top->get_impl ()); + + if (retval != DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_topic - " + "Error: RTI delete_topic returned non-ok error code %C\n", + translate_retcode (retval))); + } + else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::delete_topic - " + "Provided topic successfully deleted\n")); + + return retval; #else - return this->impl ()->delete_topic (a_topic); + return this->impl ()->delete_topic (a_topic); #endif - } + } - ::DDS::Topic_ptr - RTI_DomainParticipant_i::find_topic (const char * impl_name, - const ::DDS::Duration_t & timeout) - { - ::DDS::Topic_var retval = ::DDS::Topic::_nil (); + ::DDS::Topic_ptr + CCM_DDS_DomainParticipant_i::find_topic (const char * impl_name, + const ::DDS::Duration_t & timeout) + { + ::DDS::Topic_var retval = ::DDS::Topic::_nil (); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_Duration_t ddstimeout; - ddstimeout <<= timeout; - ::DDSTopic* topic = this->impl ()->find_topic (impl_name, ddstimeout); - if (topic) - { - ACE_NEW_RETURN (retval, - CCM_DDS_Topic_i (topic), - ::DDS::Topic::_nil ()); - } + ::DDS_Duration_t ddstimeout; + ddstimeout <<= timeout; + ::DDSTopic* topic = this->impl ()->find_topic (impl_name, ddstimeout); + if (topic) + { + ACE_NEW_RETURN (retval, + CCM_DDS_Topic_i (topic), + ::DDS::Topic::_nil ()); + } #else - ::DDS::Topic_var topic = this->impl ()->find_topic (impl_name, timeout); - if (rti_topic) - { - ACE_NEW_RETURN (retval, - CCM_DDS_Topic_i (topic.in ()), - ::DDS::Topic::_nil ()); - } + ::DDS::Topic_var topic = this->impl ()->find_topic (impl_name, timeout); + if (rti_topic) + { + ACE_NEW_RETURN (retval, + CCM_DDS_Topic_i (topic.in ()), + ::DDS::Topic::_nil ()); + } #endif - return retval._retn (); - } + return retval._retn (); + } - ::DDS::TopicDescription_ptr - RTI_DomainParticipant_i::lookup_topicdescription (const char * name) - { - ::DDS::TopicDescription_var retval = ::DDS::TopicDescription::_nil (); + ::DDS::TopicDescription_ptr + CCM_DDS_DomainParticipant_i::lookup_topicdescription (const char * name) + { + ::DDS::TopicDescription_var retval = ::DDS::TopicDescription::_nil (); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDSTopicDescription* topic = this->impl ()->lookup_topicdescription (name); - ACE_NEW_THROW_EX (retval, - CCM_DDS_TopicDescription_i (topic), - CORBA::NO_MEMORY ()); + ::DDSTopicDescription* topic = this->impl ()->lookup_topicdescription (name); + ACE_NEW_THROW_EX (retval, + CCM_DDS_TopicDescription_i (topic), + CORBA::NO_MEMORY ()); #else - ::DDSTopicDescription_var topic = this->impl ()->lookup_topicdescription (name); - ACE_NEW_THROW_EX (retval, - CCM_DDS_TopicDescription_i (topic.in ()), - CORBA::NO_MEMORY ()); + ::DDSTopicDescription_var topic = this->impl ()->lookup_topicdescription (name); + ACE_NEW_THROW_EX (retval, + CCM_DDS_TopicDescription_i (topic.in ()), + CORBA::NO_MEMORY ()); #endif - return retval._retn (); - } + return retval._retn (); + } - ::DDS::ContentFilteredTopic_ptr - RTI_DomainParticipant_i::create_contentfilteredtopic (const char * name, - ::DDS::Topic_ptr related_topic, - const char * filter_expression, - const ::DDS::StringSeq & expression_parameters) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_contentfilteredtopic"); + ::DDS::ContentFilteredTopic_ptr + CCM_DDS_DomainParticipant_i::create_contentfilteredtopic (const char * name, + ::DDS::Topic_ptr related_topic, + const char * filter_expression, + const ::DDS::StringSeq & expression_parameters) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_contentfilteredtopic"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - CCM_DDS_Topic_i *top = dynamic_cast< CCM_DDS_Topic_i *> (related_topic); - if (!top) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::create_contentfilteredtopic - " - "Unable to cast provided topic.\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - - ::DDS::ContentFilteredTopic_var retval = ::DDS::ContentFilteredTopic::_nil (); - ACE_NEW_THROW_EX (retval, - RTI_ContentFilteredTopic_i (), - CORBA::NO_MEMORY ()); - - const char** parameterlist = 0; - ACE_NEW_THROW_EX (parameterlist, - const char*[expression_parameters.length ()], - CORBA::NO_MEMORY ()); - - for (CORBA::ULong i = 0; i < expression_parameters.length (); ++i) - { - parameterlist[i] = expression_parameters[i].in (); - } - DDS_StringSeq parameters (expression_parameters.length ()); - parameters.from_array (parameterlist, expression_parameters.length ()); - - DDSContentFilteredTopic * rti_cft = this->impl ()->create_contentfilteredtopic ( - name, - top->get_impl (), - filter_expression, - parameters); - delete [] parameterlist; - if (!rti_cft) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::create_contentfilteredtopic - " - "RTI DDS returned a nil ContentFilteredTopic.\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_contentfilteredtopic - " - "Successfully created topic with name <%C> and filter expression <%C>\n", - name, filter_expression)); - - RTI_ContentFilteredTopic_i *tp = dynamic_cast < RTI_ContentFilteredTopic_i *> (retval.in ()); - tp->set_impl (rti_cft); - - return retval._retn (); + CCM_DDS_Topic_i *top = dynamic_cast< CCM_DDS_Topic_i *> (related_topic); + if (!top) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_contentfilteredtopic - " + "Unable to cast provided topic.\n")); + throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + } + + const char** parameterlist = 0; + ACE_NEW_THROW_EX (parameterlist, + const char*[expression_parameters.length ()], + CORBA::NO_MEMORY ()); + + for (CORBA::ULong i = 0; i < expression_parameters.length (); ++i) + { + parameterlist[i] = expression_parameters[i].in (); + } + DDS_StringSeq parameters (expression_parameters.length ()); + parameters.from_array (parameterlist, expression_parameters.length ()); + + DDSContentFilteredTopic * rti_cft = this->impl ()->create_contentfilteredtopic ( + name, + top->get_impl (), + filter_expression, + parameters); + delete [] parameterlist; + if (!rti_cft) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_contentfilteredtopic - " + "RTI DDS returned a nil ContentFilteredTopic.\n")); + throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + } + + ::DDS::ContentFilteredTopic_var retval = ::DDS::ContentFilteredTopic::_nil (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_ContentFilteredTopic_i (rti_cft), + CORBA::NO_MEMORY ()); + + DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_contentfilteredtopic - " + "Successfully created topic with name <%C> and filter expression <%C>\n", + name, filter_expression)); + + CCM_DDS_ContentFilteredTopic_i *tp = dynamic_cast < CCM_DDS_ContentFilteredTopic_i *> (retval.in ()); + tp->set_impl (rti_cft); + + return retval._retn (); #else - return this->impl ()->create_contentfilteredtopic ( - name, - related_topic, - filter_expression, - expression_parameters); + return this->impl ()->create_contentfilteredtopic ( + name, + related_topic, + filter_expression, + expression_parameters); #endif - } - - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::delete_contentfilteredtopic (::DDS::ContentFilteredTopic_ptr /*a_contentfilteredtopic*/) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_contentfilteredtopic"); - throw CORBA::NO_IMPLEMENT (); - - } - - ::DDS::MultiTopic_ptr - RTI_DomainParticipant_i::create_multitopic (const char * /*name*/, - const char * /*type_name*/, - const char * /*subscription_expression*/, - const ::DDS::StringSeq & /*expression_parameters*/) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_multitopic"); - throw CORBA::NO_IMPLEMENT (); - - } - - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::delete_multitopic (::DDS::MultiTopic_ptr /*a_multitopic*/) - { - //this->impl ()->delete_multitopic ( - DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_multitopic"); - throw CORBA::NO_IMPLEMENT (); - - } - - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::delete_contained_entities (void) - { - return this->impl ()->delete_contained_entities (); - - } - - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::set_qos (const ::DDS::DomainParticipantQos & /*qos*/) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_qos"); - throw CORBA::NO_IMPLEMENT (); - - } - - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::get_qos (::DDS::DomainParticipantQos & /*qos*/) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_qos"); - throw CORBA::NO_IMPLEMENT (); - - } - - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::set_listener (::DDS::DomainParticipantListener_ptr a_listener, - ::DDS::StatusMask mask) - { + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::delete_contentfilteredtopic (::DDS::ContentFilteredTopic_ptr /*a_contentfilteredtopic*/) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_contentfilteredtopic"); + throw CORBA::NO_IMPLEMENT (); + + } + + ::DDS::MultiTopic_ptr + CCM_DDS_DomainParticipant_i::create_multitopic (const char * /*name*/, + const char * /*type_name*/, + const char * /*subscription_expression*/, + const ::DDS::StringSeq & /*expression_parameters*/) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_multitopic"); + throw CORBA::NO_IMPLEMENT (); + + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::delete_multitopic (::DDS::MultiTopic_ptr /*a_multitopic*/) + { + //this->impl ()->delete_multitopic ( + DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_multitopic"); + throw CORBA::NO_IMPLEMENT (); + + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::delete_contained_entities (void) + { + return this->impl ()->delete_contained_entities (); + + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::set_qos (const ::DDS::DomainParticipantQos & /*qos*/) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_qos"); + throw CORBA::NO_IMPLEMENT (); + + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::get_qos (::DDS::DomainParticipantQos & /*qos*/) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_qos"); + throw CORBA::NO_IMPLEMENT (); + + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::set_listener (::DDS::DomainParticipantListener_ptr a_listener, + ::DDS::StatusMask mask) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - RTI_DomainParticipantListener_i* rti_impl_list = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (rti_impl_list, - RTI_DomainParticipantListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - return this->impl_->set_listener (rti_impl_list, mask); + CCM_DDS_DomainPublisherListener_i* rti_impl_list = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_impl_list, + CCM_DDS_DomainPublisherListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + return this->impl_->set_listener (rti_impl_list, mask); #else - return this->impl_->set_listener (a_listener, mask); + return this->impl_->set_listener (a_listener, mask); #endif - } + } - ::DDS::DomainParticipantListener_ptr - RTI_DomainParticipant_i::get_listener (void) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_listener"); + ::DDS::DomainParticipantListener_ptr + CCM_DDS_DomainParticipant_i::get_listener (void) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_listener"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSDomainParticipantListener *rti_dp_list = this->impl ()->get_listener (); - RTI_DomainParticipantListener_i *list_proxy = dynamic_cast <RTI_DomainParticipantListener_i *> (rti_dp_list); - if (!list_proxy) - { - DDS4CCM_DEBUG (6, (LM_DEBUG, "RTI_DomainParticipant_i::get_listener - " - "DDS returned a NIL listener.\n")); - return ::DDS::DomainParticipantListener::_nil (); - } - return list_proxy->get_domainparticipantlistener (); + DDSDomainParticipantListener *rti_dp_list = this->impl ()->get_listener (); + CCM_DDS_DomainPublisherListener_i *list_proxy = dynamic_cast <CCM_DDS_DomainPublisherListener_i *> (rti_dp_list); + if (!list_proxy) + { + DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_DomainParticipant_i::get_listener - " + "DDS returned a NIL listener.\n")); + return ::DDS::DomainParticipantListener::_nil (); + } + return list_proxy->get_domainparticipantlistener (); #else - return this->impl ()->get_listener (); + return this->impl ()->get_listener (); #endif - } + } - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::ignore_participant (DDS_INSTANCE_HANDLE_T_IN handle) - { + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::ignore_participant (DDS_INSTANCE_HANDLE_T_IN handle) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t rti_handle; - rti_handle <<= handle; - return this->impl ()->ignore_participant (rti_handle); + ::DDS_InstanceHandle_t rti_handle; + rti_handle <<= handle; + return this->impl ()->ignore_participant (rti_handle); #else - return this->impl ()->ignore_participant (handle); + return this->impl ()->ignore_participant (handle); #endif - } + } - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::ignore_topic (DDS_INSTANCE_HANDLE_T_IN handle) - { + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::ignore_topic (DDS_INSTANCE_HANDLE_T_IN handle) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t rti_handle; - rti_handle <<= handle; - return this->impl ()->ignore_topic (rti_handle); + ::DDS_InstanceHandle_t rti_handle; + rti_handle <<= handle; + return this->impl ()->ignore_topic (rti_handle); #else - return this->impl ()->ignore_topic (handle); + return this->impl ()->ignore_topic (handle); #endif - } + } - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::ignore_publication (DDS_INSTANCE_HANDLE_T_IN handle) - { + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::ignore_publication (DDS_INSTANCE_HANDLE_T_IN handle) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t rti_handle; - rti_handle <<= handle; - return this->impl ()->ignore_publication (rti_handle); + ::DDS_InstanceHandle_t rti_handle; + rti_handle <<= handle; + return this->impl ()->ignore_publication (rti_handle); #else - return this->impl ()->ignore_publication (handle); + return this->impl ()->ignore_publication (handle); #endif - } + } - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::ignore_subscription (DDS_INSTANCE_HANDLE_T_IN handle) - { + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::ignore_subscription (DDS_INSTANCE_HANDLE_T_IN handle) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t rti_handle; - rti_handle <<= handle; - return this->impl ()->ignore_subscription (rti_handle); + ::DDS_InstanceHandle_t rti_handle; + rti_handle <<= handle; + return this->impl ()->ignore_subscription (rti_handle); #else - return this->impl ()->ignore_subscription (handle); + return this->impl ()->ignore_subscription (handle); #endif - } - - ::DDS::DomainId_t - RTI_DomainParticipant_i::get_domain_id (void) - { - return this->impl ()->get_domain_id (); - } - - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::assert_liveliness (void) - { - return this->impl ()->assert_liveliness (); - } - - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::set_default_publisher_qos (const ::DDS::PublisherQos & /*qos*/) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_publisher_qos"); - throw CORBA::NO_IMPLEMENT (); - - } - - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::get_default_publisher_qos (::DDS::PublisherQos & /*qos*/) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_publisher_qos"); - throw CORBA::NO_IMPLEMENT (); - - } - - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::set_default_subscriber_qos (const ::DDS::SubscriberQos & /*qos*/) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_subscriber_qos"); - throw CORBA::NO_IMPLEMENT (); - - } - - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::get_default_subscriber_qos (::DDS::SubscriberQos & /*qos*/) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_subscriber_qos"); - throw CORBA::NO_IMPLEMENT (); - - } - - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::set_default_topic_qos (const ::DDS::TopicQos & /*qos*/) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_topic_qos"); - throw CORBA::NO_IMPLEMENT (); - - } - - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::get_default_topic_qos (::DDS::TopicQos & /*qos*/) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_topic_qos"); - throw CORBA::NO_IMPLEMENT (); - - } - - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::get_discovered_participants (::DDS::InstanceHandleSeq & impl_handles) - { + } + + ::DDS::DomainId_t + CCM_DDS_DomainParticipant_i::get_domain_id (void) + { + return this->impl ()->get_domain_id (); + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::assert_liveliness (void) + { + return this->impl ()->assert_liveliness (); + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::set_default_publisher_qos (const ::DDS::PublisherQos & /*qos*/) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_publisher_qos"); + throw CORBA::NO_IMPLEMENT (); + + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::get_default_publisher_qos (::DDS::PublisherQos & /*qos*/) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_publisher_qos"); + throw CORBA::NO_IMPLEMENT (); + + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::set_default_subscriber_qos (const ::DDS::SubscriberQos & /*qos*/) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_subscriber_qos"); + throw CORBA::NO_IMPLEMENT (); + + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::get_default_subscriber_qos (::DDS::SubscriberQos & /*qos*/) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_subscriber_qos"); + throw CORBA::NO_IMPLEMENT (); + + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::set_default_topic_qos (const ::DDS::TopicQos & /*qos*/) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_topic_qos"); + throw CORBA::NO_IMPLEMENT (); + + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::get_default_topic_qos (::DDS::TopicQos & /*qos*/) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_topic_qos"); + throw CORBA::NO_IMPLEMENT (); + + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::get_discovered_participants (::DDS::InstanceHandleSeq & impl_handles) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandleSeq rtiseq; - ::DDS::ReturnCode_t const retval = this->impl ()->get_discovered_participants (rtiseq); - rtiseq >>= impl_handles; - return retval; + ::DDS_InstanceHandleSeq rtiseq; + ::DDS::ReturnCode_t const retval = this->impl ()->get_discovered_participants (rtiseq); + rtiseq >>= impl_handles; + return retval; #else - return this->impl ()->get_discovered_participants (impl_handles); + return this->impl ()->get_discovered_participants (impl_handles); #endif - } + } - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::get_discovered_participant_data (::DDS::ParticipantBuiltinTopicData & /*impl_data*/, - DDS_INSTANCE_HANDLE_T_IN /*impl_handle*/) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_discovered_participant_data"); - throw CORBA::NO_IMPLEMENT (); + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::get_discovered_participant_data (::DDS::ParticipantBuiltinTopicData & /*impl_data*/, + DDS_INSTANCE_HANDLE_T_IN /*impl_handle*/) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_discovered_participant_data"); + throw CORBA::NO_IMPLEMENT (); - } + } - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::get_discovered_topics (::DDS::InstanceHandleSeq & impl_handles) - { + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::get_discovered_topics (::DDS::InstanceHandleSeq & impl_handles) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandleSeq rtiseq; - ::DDS::ReturnCode_t const retval = this->impl ()->get_discovered_topics (rtiseq); - rtiseq >>= impl_handles; - return retval; + ::DDS_InstanceHandleSeq rtiseq; + ::DDS::ReturnCode_t const retval = this->impl ()->get_discovered_topics (rtiseq); + rtiseq >>= impl_handles; + return retval; #else - return this->impl ()->get_discovered_topics (impl_handles); + return this->impl ()->get_discovered_topics (impl_handles); #endif - } + } - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::get_discovered_topic_data (::DDS::TopicBuiltinTopicData & /*impl_data*/, - DDS_INSTANCE_HANDLE_T_IN /*impl_handle*/) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_discovered_topic_data"); - throw CORBA::NO_IMPLEMENT (); + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::get_discovered_topic_data (::DDS::TopicBuiltinTopicData & /*impl_data*/, + DDS_INSTANCE_HANDLE_T_IN /*impl_handle*/) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_discovered_topic_data"); + throw CORBA::NO_IMPLEMENT (); - } + } - ::CORBA::Boolean - RTI_DomainParticipant_i::contains_entity (DDS_INSTANCE_HANDLE_T_IN a_handle) - { + ::CORBA::Boolean + CCM_DDS_DomainParticipant_i::contains_entity (DDS_INSTANCE_HANDLE_T_IN a_handle) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t rti_handle; - rti_handle <<= a_handle; - return this->impl ()->contains_entity (rti_handle); + ::DDS_InstanceHandle_t rti_handle; + rti_handle <<= a_handle; + return this->impl ()->contains_entity (rti_handle); #else - return this->impl ()->contains_entity (a_handle); + return this->impl ()->contains_entity (a_handle); #endif - } + } - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::get_current_time (::DDS::Time_t & current_time) - { + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::get_current_time (::DDS::Time_t & current_time) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_Time_t rti_time; - ::DDS::ReturnCode_t const retval = this->impl ()->get_current_time (rti_time); - rti_time >>= current_time; - return retval; + DDS_Time_t rti_time; + ::DDS::ReturnCode_t const retval = this->impl ()->get_current_time (rti_time); + rti_time >>= current_time; + return retval; #else - return this->impl ()->get_current_time (current_time); + return this->impl ()->get_current_time (current_time); #endif - } - - ::DDS::ReturnCode_t - RTI_DomainParticipant_i::enable (void) - { - return this->impl ()->enable (); - } - - ::DDS::StatusCondition_ptr - RTI_DomainParticipant_i::get_statuscondition (void) - { - ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::enable (void) + { + return this->impl ()->enable (); + } + + ::DDS::StatusCondition_ptr + CCM_DDS_DomainParticipant_i::get_statuscondition (void) + { + ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSStatusCondition* sc = this->impl ()->get_statuscondition (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc), - CORBA::NO_MEMORY ()); + DDSStatusCondition* sc = this->impl ()->get_statuscondition (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc), + CORBA::NO_MEMORY ()); #else - ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc.in ()), - CORBA::NO_MEMORY ()); + ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc.in ()), + CORBA::NO_MEMORY ()); #endif - return retval._retn (); - } - - ::DDS::StatusMask - RTI_DomainParticipant_i::get_status_changes (void) - { - return this->impl ()->get_status_changes (); - } - - DDS_INSTANCE_HANDLE_T_RETN - RTI_DomainParticipant_i::get_instance_handle (void) - { + return retval._retn (); + } + + ::DDS::StatusMask + CCM_DDS_DomainParticipant_i::get_status_changes (void) + { + return this->impl ()->get_status_changes (); + } + + DDS_INSTANCE_HANDLE_T_RETN + CCM_DDS_DomainParticipant_i::get_instance_handle (void) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); - ::DDS::InstanceHandle_t handle; - handle <<= rtihandle; - return handle; + ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); + ::DDS::InstanceHandle_t handle; + handle <<= rtihandle; + return handle; #else - return this->impl ()->get_instance_handle (); + return this->impl ()->get_instance_handle (); #endif - } - - DDSDomainParticipant * - RTI_DomainParticipant_i::get_impl (void) - { - return this->impl_; - } - - void - RTI_DomainParticipant_i::set_impl (DDSDomainParticipant * dp) - { - this->impl_ = dp; - } - - DDSDomainParticipant * - RTI_DomainParticipant_i::impl (void) - { - if (!this->impl_) - { - throw ::CORBA::BAD_INV_ORDER (); - } - return this->impl_; - } + } + + DDSDomainParticipant * + CCM_DDS_DomainParticipant_i::get_impl (void) + { + return this->impl_; + } + + void + CCM_DDS_DomainParticipant_i::set_impl (DDSDomainParticipant * dp) + { + this->impl_ = dp; + } + + DDSDomainParticipant * + CCM_DDS_DomainParticipant_i::impl (void) + { + if (!this->impl_) + { + throw ::CORBA::BAD_INV_ORDER (); + } + return this->impl_; } } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h index 22cb4a3e268..f8658668c1b 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h @@ -30,181 +30,178 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DomainParticipant_i : + public virtual ::DDS::CCM_DomainParticipant, + public virtual ::CORBA::LocalObject { - class DDS4CCM_NDDS_IMPL_Export RTI_DomainParticipant_i : - public virtual ::DDS::CCM_DomainParticipant, - public virtual ::CORBA::LocalObject - { - public: - // Constructor - RTI_DomainParticipant_i (void); - - // Destructor - virtual ~RTI_DomainParticipant_i (void); - - virtual ::DDS::Publisher_ptr create_publisher ( - const ::DDS::PublisherQos & qos, - ::DDS::PublisherListener_ptr a_listener, - ::DDS::StatusMask mask); + public: + /// Constructor + CCM_DDS_DomainParticipant_i (DDSDomainParticipant * dp); + + /// Destructor + virtual ~CCM_DDS_DomainParticipant_i (void); + + virtual ::DDS::Publisher_ptr create_publisher ( + const ::DDS::PublisherQos & qos, + ::DDS::PublisherListener_ptr a_listener, + ::DDS::StatusMask mask); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - virtual ::DDS::Publisher_ptr create_publisher_with_profile ( - const char* library_name, - const char *profile_name, - ::DDS::PublisherListener_ptr a_listener, - ::DDS::StatusMask mask); -#endif + virtual ::DDS::Publisher_ptr create_publisher_with_profile ( + const char* library_name, + const char *profile_name, + ::DDS::PublisherListener_ptr a_listener, + ::DDS::StatusMask mask); +#endif - virtual ::DDS::ReturnCode_t delete_publisher (::DDS::Publisher_ptr p); + virtual ::DDS::ReturnCode_t delete_publisher (::DDS::Publisher_ptr p); - virtual ::DDS::Subscriber_ptr create_subscriber ( - const ::DDS::SubscriberQos & qos, - ::DDS::SubscriberListener_ptr a_listener, - ::DDS::StatusMask mask); + virtual ::DDS::Subscriber_ptr create_subscriber ( + const ::DDS::SubscriberQos & qos, + ::DDS::SubscriberListener_ptr a_listener, + ::DDS::StatusMask mask); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - virtual ::DDS::Subscriber_ptr create_subscriber_with_profile( - const char* library_name, - const char *profile_name, - ::DDS::SubscriberListener_ptr a_listener, - ::DDS::StatusMask mask); + virtual ::DDS::Subscriber_ptr create_subscriber_with_profile( + const char* library_name, + const char *profile_name, + ::DDS::SubscriberListener_ptr a_listener, + ::DDS::StatusMask mask); #endif - virtual ::DDS::ReturnCode_t delete_subscriber (::DDS::Subscriber_ptr s); + virtual ::DDS::ReturnCode_t delete_subscriber (::DDS::Subscriber_ptr s); - virtual ::DDS::Subscriber_ptr get_builtin_subscriber (void); + virtual ::DDS::Subscriber_ptr get_builtin_subscriber (void); - virtual ::DDS::Topic_ptr create_topic ( - const char * impl_name, - const char * type_name, - const ::DDS::TopicQos & qos, - ::DDS::TopicListener_ptr a_listener, - ::DDS::StatusMask mask); + virtual ::DDS::Topic_ptr create_topic ( + const char * impl_name, + const char * type_name, + const ::DDS::TopicQos & qos, + ::DDS::TopicListener_ptr a_listener, + ::DDS::StatusMask mask); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - virtual ::DDS::Topic_ptr create_topic_with_profile ( - const char * impl_name, - const char * type_name, - const char* library_name, - const char *profile_name, - ::DDS::TopicListener_ptr a_listener, - ::DDS::StatusMask mask); + virtual ::DDS::Topic_ptr create_topic_with_profile ( + const char * impl_name, + const char * type_name, + const char* library_name, + const char *profile_name, + ::DDS::TopicListener_ptr a_listener, + ::DDS::StatusMask mask); #endif - virtual ::DDS::ReturnCode_t delete_topic (::DDS::Topic_ptr a_topic); + virtual ::DDS::ReturnCode_t delete_topic (::DDS::Topic_ptr a_topic); - virtual ::DDS::Topic_ptr find_topic ( - const char * impl_name, - const ::DDS::Duration_t & timeout); + virtual ::DDS::Topic_ptr find_topic ( + const char * impl_name, + const ::DDS::Duration_t & timeout); - virtual ::DDS::TopicDescription_ptr lookup_topicdescription ( - const char * name); + virtual ::DDS::TopicDescription_ptr lookup_topicdescription ( + const char * name); - virtual ::DDS::ContentFilteredTopic_ptr create_contentfilteredtopic ( - const char * name, - ::DDS::Topic_ptr related_topic, - const char * filter_expression, - const ::DDS::StringSeq & expression_parameters); + virtual ::DDS::ContentFilteredTopic_ptr create_contentfilteredtopic ( + const char * name, + ::DDS::Topic_ptr related_topic, + const char * filter_expression, + const ::DDS::StringSeq & expression_parameters); - virtual ::DDS::ReturnCode_t delete_contentfilteredtopic ( - ::DDS::ContentFilteredTopic_ptr a_contentfilteredtopic); + virtual ::DDS::ReturnCode_t delete_contentfilteredtopic ( + ::DDS::ContentFilteredTopic_ptr a_contentfilteredtopic); - virtual ::DDS::MultiTopic_ptr create_multitopic ( - const char * name, - const char * type_name, - const char * subscription_expression, - const ::DDS::StringSeq & expression_parameters); + virtual ::DDS::MultiTopic_ptr create_multitopic ( + const char * name, + const char * type_name, + const char * subscription_expression, + const ::DDS::StringSeq & expression_parameters); - virtual ::DDS::ReturnCode_t delete_multitopic ( - ::DDS::MultiTopic_ptr a_multitopic); + virtual ::DDS::ReturnCode_t delete_multitopic ( + ::DDS::MultiTopic_ptr a_multitopic); - virtual ::DDS::ReturnCode_t delete_contained_entities (void); + virtual ::DDS::ReturnCode_t delete_contained_entities (void); - virtual ::DDS::ReturnCode_t set_qos ( - const ::DDS::DomainParticipantQos & qos); + virtual ::DDS::ReturnCode_t set_qos ( + const ::DDS::DomainParticipantQos & qos); - virtual ::DDS::ReturnCode_t get_qos ( - ::DDS::DomainParticipantQos & qos); + virtual ::DDS::ReturnCode_t get_qos ( + ::DDS::DomainParticipantQos & qos); - virtual ::DDS::ReturnCode_t set_listener ( - ::DDS::DomainParticipantListener_ptr a_listener, - ::DDS::StatusMask mask); + virtual ::DDS::ReturnCode_t set_listener ( + ::DDS::DomainParticipantListener_ptr a_listener, + ::DDS::StatusMask mask); - virtual ::DDS::DomainParticipantListener_ptr get_listener (void); + virtual ::DDS::DomainParticipantListener_ptr get_listener (void); - virtual ::DDS::ReturnCode_t ignore_participant ( - DDS_INSTANCE_HANDLE_T_IN handle); + virtual ::DDS::ReturnCode_t ignore_participant ( + DDS_INSTANCE_HANDLE_T_IN handle); - virtual ::DDS::ReturnCode_t ignore_topic ( - DDS_INSTANCE_HANDLE_T_IN handle); + virtual ::DDS::ReturnCode_t ignore_topic ( + DDS_INSTANCE_HANDLE_T_IN handle); - virtual ::DDS::ReturnCode_t ignore_publication ( - DDS_INSTANCE_HANDLE_T_IN handle); + virtual ::DDS::ReturnCode_t ignore_publication ( + DDS_INSTANCE_HANDLE_T_IN handle); - virtual ::DDS::ReturnCode_t ignore_subscription ( - DDS_INSTANCE_HANDLE_T_IN handle); + virtual ::DDS::ReturnCode_t ignore_subscription ( + DDS_INSTANCE_HANDLE_T_IN handle); - virtual ::DDS::DomainId_t get_domain_id (void); + virtual ::DDS::DomainId_t get_domain_id (void); - virtual ::DDS::ReturnCode_t assert_liveliness (void); + virtual ::DDS::ReturnCode_t assert_liveliness (void); - virtual ::DDS::ReturnCode_t set_default_publisher_qos ( - const ::DDS::PublisherQos & qos); + virtual ::DDS::ReturnCode_t set_default_publisher_qos ( + const ::DDS::PublisherQos & qos); - virtual ::DDS::ReturnCode_t get_default_publisher_qos ( - ::DDS::PublisherQos & qos); + virtual ::DDS::ReturnCode_t get_default_publisher_qos ( + ::DDS::PublisherQos & qos); - virtual ::DDS::ReturnCode_t set_default_subscriber_qos ( - const ::DDS::SubscriberQos & qos); + virtual ::DDS::ReturnCode_t set_default_subscriber_qos ( + const ::DDS::SubscriberQos & qos); - virtual ::DDS::ReturnCode_t get_default_subscriber_qos ( - ::DDS::SubscriberQos & qos); + virtual ::DDS::ReturnCode_t get_default_subscriber_qos ( + ::DDS::SubscriberQos & qos); - virtual ::DDS::ReturnCode_t set_default_topic_qos ( - const ::DDS::TopicQos & qos); + virtual ::DDS::ReturnCode_t set_default_topic_qos ( + const ::DDS::TopicQos & qos); - virtual ::DDS::ReturnCode_t get_default_topic_qos ( - ::DDS::TopicQos & qos); + virtual ::DDS::ReturnCode_t get_default_topic_qos ( + ::DDS::TopicQos & qos); - virtual ::DDS::ReturnCode_t get_discovered_participants ( - ::DDS::InstanceHandleSeq & impl_handles); + virtual ::DDS::ReturnCode_t get_discovered_participants ( + ::DDS::InstanceHandleSeq & impl_handles); - virtual ::DDS::ReturnCode_t get_discovered_participant_data ( - ::DDS::ParticipantBuiltinTopicData & impl_data, - DDS_INSTANCE_HANDLE_T_IN impl_handle); + virtual ::DDS::ReturnCode_t get_discovered_participant_data ( + ::DDS::ParticipantBuiltinTopicData & impl_data, + DDS_INSTANCE_HANDLE_T_IN impl_handle); - virtual ::DDS::ReturnCode_t get_discovered_topics ( - ::DDS::InstanceHandleSeq & impl_handles); + virtual ::DDS::ReturnCode_t get_discovered_topics ( + ::DDS::InstanceHandleSeq & impl_handles); - virtual ::DDS::ReturnCode_t get_discovered_topic_data ( - ::DDS::TopicBuiltinTopicData & impl_data, - DDS_INSTANCE_HANDLE_T_IN impl_handle); + virtual ::DDS::ReturnCode_t get_discovered_topic_data ( + ::DDS::TopicBuiltinTopicData & impl_data, + DDS_INSTANCE_HANDLE_T_IN impl_handle); - virtual ::CORBA::Boolean contains_entity ( - DDS_INSTANCE_HANDLE_T_IN a_handle); + virtual ::CORBA::Boolean contains_entity ( + DDS_INSTANCE_HANDLE_T_IN a_handle); - virtual ::DDS::ReturnCode_t get_current_time ( - ::DDS::Time_t & current_time); + virtual ::DDS::ReturnCode_t get_current_time ( + ::DDS::Time_t & current_time); - virtual ::DDS::ReturnCode_t enable (void); + virtual ::DDS::ReturnCode_t enable (void); - virtual ::DDS::StatusCondition_ptr get_statuscondition (void); + virtual ::DDS::StatusCondition_ptr get_statuscondition (void); - virtual ::DDS::StatusMask get_status_changes (void); + virtual ::DDS::StatusMask get_status_changes (void); - virtual DDS_INSTANCE_HANDLE_T_RETN get_instance_handle (void); + virtual DDS_INSTANCE_HANDLE_T_RETN get_instance_handle (void); - DDSDomainParticipant * get_impl (void); + DDSDomainParticipant * get_impl (void); - void set_impl (DDSDomainParticipant * dp); + void set_impl (DDSDomainParticipant * dp); - protected: - DDSDomainParticipant *impl_; + protected: + DDSDomainParticipant *impl_; - DDSDomainParticipant * impl (void); - }; - } + DDSDomainParticipant * impl (void); + }; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp index 6dc63775855..d385fb4c128 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp @@ -16,298 +16,295 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + CCM_DDS_DomainParticipantFactory_i::CCM_DDS_DomainParticipantFactory_i (void) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::CCM_DDS_DomainParticipantFactory_i"); + } + + CCM_DDS_DomainParticipantFactory_i::~CCM_DDS_DomainParticipantFactory_i (void) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::~CCM_DDS_DomainParticipantFactory_i"); + } + + ::DDS::DomainParticipant_ptr + CCM_DDS_DomainParticipantFactory_i::create_participant (::DDS::DomainId_t domain_id, + const ::DDS::DomainParticipantQos & qos, + ::DDS::DomainParticipantListener_ptr a_listener, + ::DDS::StatusMask mask) { - RTI_DomainParticipantFactory_i::RTI_DomainParticipantFactory_i (void) - { - DDS4CCM_TRACE ("RTI_DomainParticipantFactory_i::RTI_DomainParticipantFactory_i"); - } - - RTI_DomainParticipantFactory_i::~RTI_DomainParticipantFactory_i (void) - { - DDS4CCM_TRACE ("RTI_DomainParticipantFactory_i::~RTI_DomainParticipantFactory_i"); - } - - ::DDS::DomainParticipant_ptr - RTI_DomainParticipantFactory_i::create_participant (::DDS::DomainId_t domain_id, - const ::DDS::DomainParticipantQos & qos, - ::DDS::DomainParticipantListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("RTI_DomainParticipantFactory_i::create_participant"); + DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::create_participant"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ACE_UNUSED_ARG (qos); + ACE_UNUSED_ARG (qos); - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipantFactory_i::create_participant - " - "Creating domain participant for domain <%d>\n", - domain_id)); + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipantFactory_i::create_participant - " + "Creating domain participant for domain <%d>\n", + domain_id)); - RTI_DomainParticipantListener_i *rti_dpl = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (rti_dpl, - RTI_DomainParticipantListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - - ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); - ACE_NEW_THROW_EX (retval, - RTI_DomainParticipant_i (), - CORBA::NO_MEMORY ()); + CCM_DDS_DomainPublisherListener_i *rti_dpl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_dpl, + CCM_DDS_DomainPublisherListener_i (a_listener), + CORBA::NO_MEMORY ()); + } - DDSDomainParticipant *part = DDSDomainParticipantFactory::get_instance ()-> - create_participant (domain_id, - DDS_PARTICIPANT_QOS_DEFAULT, - rti_dpl, - mask); + DDSDomainParticipant *part = DDSDomainParticipantFactory::get_instance ()-> + create_participant (domain_id, + DDS_PARTICIPANT_QOS_DEFAULT, + rti_dpl, + mask); - if (!part) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipantFactory_i::create_participant - " - "Error: Unable to create DomainParticipant for domain <%d>\n", - domain_id)); - throw CCM_DDS::InternalError (1, 0); - } + if (!part) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipantFactory_i::create_participant - " + "Error: Unable to create DomainParticipant for domain <%d>\n", + domain_id)); + throw CCM_DDS::InternalError (1, 0); + } - part->enable (); - RTI_DomainParticipant_i *rti_dp = dynamic_cast < RTI_DomainParticipant_i *> (retval.in ()); - rti_dp->set_impl (part); + ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (part), + CORBA::NO_MEMORY ()); + part->enable (); + CCM_DDS_DomainParticipant_i *rti_dp = dynamic_cast < CCM_DDS_DomainParticipant_i *> (retval.in ()); + rti_dp->set_impl (part); - return retval._retn (); + return retval._retn (); #else - return DDSDomainParticipantFactory::get_instance ()-> - create_participant (domain_id, - qos, - a_listener, - mask); + return DDSDomainParticipantFactory::get_instance ()-> + create_participant (domain_id, + qos, + a_listener, + mask); #endif - } + } #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::DomainParticipant_ptr - RTI_DomainParticipantFactory_i::create_participant_with_profile ( - ::DDS::DomainId_t domain_id, - const char * library_name, - const char * profile_name, - ::DDS::DomainParticipantListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("RTI_DomainParticipantFactory_i::create_participant_with_profile"); - - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipantFactory_i::create_participant_with_profile - " - "Creating domain participant: profile <%C#%C> - domain <%d>\n", - library_name, profile_name, domain_id)); - RTI_DomainParticipantListener_i *rti_dpl = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (rti_dpl, - RTI_DomainParticipantListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - - ACE_CString qos_profile = library_name; - qos_profile += ACE_TEXT ("#"); - qos_profile += profile_name; - - RTI_DomainParticipant_i *rti_dp = 0; + ::DDS::DomainParticipant_ptr + CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile ( + ::DDS::DomainId_t domain_id, + const char * library_name, + const char * profile_name, + ::DDS::DomainParticipantListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile"); - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->dps_mutex_, CORBA::INTERNAL ()); + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile - " + "Creating domain participant: profile <%C#%C> - domain <%d>\n", + library_name, profile_name, domain_id)); + CCM_DDS_DomainPublisherListener_i *rti_dpl = 0; + if (!CORBA::is_nil (a_listener)) { - rti_dp = this->dps_[qos_profile]; + ACE_NEW_THROW_EX (rti_dpl, + CCM_DDS_DomainPublisherListener_i (a_listener), + CORBA::NO_MEMORY ()); + } - if (!rti_dp) - { - ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); - ACE_NEW_THROW_EX (retval, - RTI_DomainParticipant_i (), - CORBA::NO_MEMORY ()); - - DDS4CCM_DEBUG (6, (LM_DEBUG, "RTI_DomainParticipantFactory_i::create_participant_with_profile - " - "Creating participant: profile <%C> - domain <%d>\n", - qos_profile.c_str (), - domain_id)); - DDSDomainParticipant * part = DDSDomainParticipantFactory::get_instance ()-> - create_participant_with_profile (domain_id, - library_name, - profile_name, - rti_dpl, - mask); - if (!part) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipantFactory_i::create_participant_with_profile - " - "Error: Unable to create DomainParticipant\n")); - throw CCM_DDS::InternalError (1, 0); - } - part->enable (); + ACE_CString qos_profile = library_name; + qos_profile += ACE_TEXT ("#"); + qos_profile += profile_name; - rti_dp = dynamic_cast < RTI_DomainParticipant_i *> (retval.in ()); - rti_dp->set_impl (part); - this->dps_[qos_profile] = rti_dp; - return retval._retn (); - } - else - { - DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "RTI_DomainParticipantFactory_i::create_participant_with_profile - " - "Re-using participant for QOS profile <%C> and domin <%d>.\n", - qos_profile.c_str (), - domain_id)); - return ::DDS::DomainParticipant::_duplicate (rti_dp); - } - } - } -#endif + CCM_DDS_DomainParticipant_i *rti_dp = 0; - void - RTI_DomainParticipantFactory_i::remove_participant (RTI_DomainParticipant_i * part) + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, + this->dps_mutex_, CORBA::INTERNAL ()); { - DDS4CCM_TRACE ("RTI_DomainParticipantFactory_i::remove_participant"); + rti_dp = this->dps_[qos_profile]; -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->dps_mutex_, CORBA::INTERNAL ()); - - if (part->_refcount_value () == 1) + if (!rti_dp) { - DomainParticipants::iterator pos; - for (pos = this->dps_.begin(); pos != this->dps_.end(); ++pos) + DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile - " + "Creating participant: profile <%C> - domain <%d>\n", + qos_profile.c_str (), + domain_id)); + DDSDomainParticipant * part = DDSDomainParticipantFactory::get_instance ()-> + create_participant_with_profile (domain_id, + library_name, + profile_name, + rti_dpl, + mask); + if (!part) { - if (pos->second == part) - { - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipantFactory_i::remove_participant - " - "Removing participant for %C from list.\n", - pos->first.c_str ())); - this->dps_.erase (pos->first); - break; - } + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile - " + "Error: Unable to create DomainParticipant\n")); + throw CCM_DDS::InternalError (1, 0); } + ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (part), + CORBA::NO_MEMORY ()); + + part->enable (); + + rti_dp = dynamic_cast < CCM_DDS_DomainParticipant_i *> (retval.in ()); + rti_dp->set_impl (part); + this->dps_[qos_profile] = rti_dp; + return retval._retn (); } else { - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipantFactory_i::remove_participant - " - "Don't delete participant since it's still used - ref_count <%d>\n", - part->_refcount_value ())); + DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile - " + "Re-using participant for QOS profile <%C> and domin <%d>.\n", + qos_profile.c_str (), + domain_id)); + return ::DDS::DomainParticipant::_duplicate (rti_dp); } + } + } +#endif + + void + CCM_DDS_DomainParticipantFactory_i::remove_participant (CCM_DDS_DomainParticipant_i * part) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::remove_participant"); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, + this->dps_mutex_, CORBA::INTERNAL ()); + + if (part->_refcount_value () == 1) + { + DomainParticipants::iterator pos; + for (pos = this->dps_.begin(); pos != this->dps_.end(); ++pos) + { + if (pos->second == part) + { + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipantFactory_i::remove_participant - " + "Removing participant for %C from list.\n", + pos->first.c_str ())); + this->dps_.erase (pos->first); + break; + } + } + } + else + { + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipantFactory_i::remove_participant - " + "Don't delete participant since it's still used - ref_count <%d>\n", + part->_refcount_value ())); + } #else #endif - } + } - ::DDS::ReturnCode_t - RTI_DomainParticipantFactory_i::delete_participant (::DDS::DomainParticipant_ptr a_participant) - { - DDS4CCM_TRACE ("RTI_DomainParticipantFactory_i::delete_participant"); + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipantFactory_i::delete_participant (::DDS::DomainParticipant_ptr a_participant) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::delete_participant"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - RTI_DomainParticipant_i *part = dynamic_cast< RTI_DomainParticipant_i * > (a_participant); + CCM_DDS_DomainParticipant_i *part = dynamic_cast< CCM_DDS_DomainParticipant_i * > (a_participant); - if (!part) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipantFactory_i::delete_participant - " - "Unable to cast provided object reference to servant type, bailing.\n")); - return DDS::RETCODE_ERROR; - } - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipantFactory_i::delete_participant - " - "Successfully casted provided object reference to servant type.\n")); + if (!part) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipantFactory_i::delete_participant - " + "Unable to cast provided object reference to servant type, bailing.\n")); + return DDS::RETCODE_ERROR; + } + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipantFactory_i::delete_participant - " + "Successfully casted provided object reference to servant type.\n")); - this->remove_participant (part); + this->remove_participant (part); - DDS::ReturnCode_t retval = DDS::RETCODE_OK; + DDS::ReturnCode_t retval = DDS::RETCODE_OK; - if (part->_refcount_value () == 1) - { - retval = DDSDomainParticipantFactory::get_instance ()-> - delete_participant (part->get_impl ()); + if (part->_refcount_value () == 1) + { + retval = DDSDomainParticipantFactory::get_instance ()-> + delete_participant (part->get_impl ()); - if (retval != DDS::RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipantFactory_i::delete_participant - " - "RTI delete_participant returned non-ok error code %C\n", - translate_retcode (retval))); - } - else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "RTI_DomainParticipantFactory_i::delete_participant - " - "Successfully deleted provided participant.\n")); - } - return retval; + if (retval != DDS::RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipantFactory_i::delete_participant - " + "RTI delete_participant returned non-ok error code %C\n", + translate_retcode (retval))); + } + else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipantFactory_i::delete_participant - " + "Successfully deleted provided participant.\n")); + } + return retval; #else - return DDSDomainParticipantFactory::get_instance ()-> - delete_participant (a_participant); + return DDSDomainParticipantFactory::get_instance ()-> + delete_participant (a_participant); #endif - } + } - ::DDS::DomainParticipant_ptr - RTI_DomainParticipantFactory_i::lookup_participant (::DDS::DomainId_t domain_id) - { + ::DDS::DomainParticipant_ptr + CCM_DDS_DomainParticipantFactory_i::lookup_participant (::DDS::DomainId_t domain_id) + { + ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); - ACE_NEW_THROW_EX (retval, - RTI_DomainParticipant_i (), - CORBA::NO_MEMORY ()); - DDSDomainParticipant* dp = DDSDomainParticipantFactory::get_instance ()->lookup_participant (domain_id); - RTI_DomainParticipant_i *rti_dp = dynamic_cast < RTI_DomainParticipant_i *> (retval.in ()); - rti_dp->set_impl (dp); - return retval._retn (); + DDSDomainParticipant* dp = DDSDomainParticipantFactory::get_instance ()->lookup_participant (domain_id); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (dp), + CORBA::NO_MEMORY ()); #else - return DDSDomainParticipantFactory::get_instance ()->lookup_participant (domain_id); + ::DDS::DomainParticipant_var dp = DDSDomainParticipantFactory::get_instance ()->lookup_participant (domain_id); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (dp.in ()), + CORBA::NO_MEMORY ()); #endif - } + return retval._retn (); + } - ::DDS::ReturnCode_t - RTI_DomainParticipantFactory_i::set_default_participant_qos (const ::DDS::DomainParticipantQos & /*qos*/) - { - DDS4CCM_TRACE ("RTI_DomainParticipantFactory_i::set_default_participant_qos"); + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipantFactory_i::set_default_participant_qos (const ::DDS::DomainParticipantQos & /*qos*/) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::set_default_participant_qos"); - throw CORBA::NO_IMPLEMENT (); - } + throw CORBA::NO_IMPLEMENT (); + } - ::DDS::ReturnCode_t - RTI_DomainParticipantFactory_i::get_default_participant_qos (::DDS::DomainParticipantQos & /*qos*/) - { - DDS4CCM_TRACE ("RTI_DomainParticipantFactory_i::get_default_participant_qos"); + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipantFactory_i::get_default_participant_qos (::DDS::DomainParticipantQos & /*qos*/) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::get_default_participant_qos"); - throw CORBA::NO_IMPLEMENT (); - } + throw CORBA::NO_IMPLEMENT (); + } - ::DDS::ReturnCode_t - RTI_DomainParticipantFactory_i::set_qos (const ::DDS::DomainParticipantFactoryQos & /*qos*/) - { - DDS4CCM_TRACE ("RTI_DomainParticipantFactory_i::set_qos"); + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipantFactory_i::set_qos (const ::DDS::DomainParticipantFactoryQos & /*qos*/) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::set_qos"); - throw CORBA::NO_IMPLEMENT (); - } + throw CORBA::NO_IMPLEMENT (); + } - ::DDS::ReturnCode_t - RTI_DomainParticipantFactory_i::get_qos (::DDS::DomainParticipantFactoryQos & /*qos*/) - { - DDS4CCM_TRACE ("RTI_DomainParticipantFactory_i::get_qos"); + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipantFactory_i::get_qos (::DDS::DomainParticipantFactoryQos & /*qos*/) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::get_qos"); - throw CORBA::NO_IMPLEMENT (); - } + throw CORBA::NO_IMPLEMENT (); + } #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::ReturnCode_t - RTI_DomainParticipantFactory_i::set_default_participant_qos_with_profile ( - const char * library_name, - const char * profile_name) - { - DDS4CCM_TRACE ("RTI_DomainParticipantFactory_i::set_default_participant_qos_with_profile"); + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipantFactory_i::set_default_participant_qos_with_profile ( + const char * library_name, + const char * profile_name) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::set_default_participant_qos_with_profile"); - return DDSDomainParticipantFactory::get_instance ()->set_default_participant_qos_with_profile (library_name, profile_name); - } + return DDSDomainParticipantFactory::get_instance ()->set_default_participant_qos_with_profile (library_name, profile_name); + } #endif - + #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) - ::DDS::DomainParticipantFactory_ptr - RTI_DomainParticipantFactory_i::get_instance (void) - { - return 0; - } -#endif + ::DDS::DomainParticipantFactory_ptr + CCM_DDS_DomainParticipantFactory_i::get_instance (void) + { + return 0; } +#endif } } #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton<CIAO::DDS4CCM::RTI::RTI_DomainParticipantFactory_i, TAO_SYNCH_MUTEX> * - ACE_Singleton<CIAO::DDS4CCM::RTI::RTI_DomainParticipantFactory_i, TAO_SYNCH_MUTEX>::singleton_; +template ACE_Singleton<CIAO::DDS4CCM::CCM_DDS_DomainParticipantFactory_i, TAO_SYNCH_MUTEX> * + ACE_Singleton<CIAO::DDS4CCM::CCM_DDS_DomainParticipantFactory_i, TAO_SYNCH_MUTEX>::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h index 4d2fd58c585..bb27d7cc1ab 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h @@ -26,89 +26,86 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI - { - class RTI_DomainParticipant_i; + class CCM_DDS_DomainParticipant_i; - class DDS4CCM_NDDS_IMPL_Export RTI_DomainParticipantFactory_i : - public virtual ::DDS::CCM_DomainParticipantFactory, - public virtual ::CORBA::LocalObject - { - friend class ACE_Singleton<RTI_DomainParticipantFactory_i, TAO_SYNCH_MUTEX>; + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DomainParticipantFactory_i : + public virtual ::DDS::CCM_DomainParticipantFactory, + public virtual ::CORBA::LocalObject + { + friend class ACE_Singleton<CCM_DDS_DomainParticipantFactory_i, TAO_SYNCH_MUTEX>; - private: - // Construtor - RTI_DomainParticipantFactory_i (void); + private: + // Construtor + CCM_DDS_DomainParticipantFactory_i (void); - // Destructor - virtual ~RTI_DomainParticipantFactory_i (void); + /// Destructor + virtual ~CCM_DDS_DomainParticipantFactory_i (void); - public: + public: #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) - virtual ::DDS::DomainParticipantFactory_ptr get_instance (void); + virtual ::DDS::DomainParticipantFactory_ptr get_instance (void); #endif - virtual - ::DDS::DomainParticipant_ptr create_participant (::DDS::DomainId_t domain_id, - const ::DDS::DomainParticipantQos & qos, - ::DDS::DomainParticipantListener_ptr a_listener, - ::DDS::StatusMask mask); + virtual + ::DDS::DomainParticipant_ptr create_participant (::DDS::DomainId_t domain_id, + const ::DDS::DomainParticipantQos & qos, + ::DDS::DomainParticipantListener_ptr a_listener, + ::DDS::StatusMask mask); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - virtual - ::DDS::DomainParticipant_ptr create_participant_with_profile (::DDS::DomainId_t domain_id, - const char * library_name, - const char * profile_name, - ::DDS::DomainParticipantListener_ptr a_listener, - ::DDS::StatusMask mask); + virtual + ::DDS::DomainParticipant_ptr create_participant_with_profile (::DDS::DomainId_t domain_id, + const char * library_name, + const char * profile_name, + ::DDS::DomainParticipantListener_ptr a_listener, + ::DDS::StatusMask mask); #endif - virtual - ::DDS::ReturnCode_t delete_participant (::DDS::DomainParticipant_ptr a_participant); + virtual + ::DDS::ReturnCode_t delete_participant (::DDS::DomainParticipant_ptr a_participant); - virtual - ::DDS::DomainParticipant_ptr lookup_participant (::DDS::DomainId_t domain_id); + virtual + ::DDS::DomainParticipant_ptr lookup_participant (::DDS::DomainId_t domain_id); - virtual - ::DDS::ReturnCode_t set_default_participant_qos (const ::DDS::DomainParticipantQos & qos); + virtual + ::DDS::ReturnCode_t set_default_participant_qos (const ::DDS::DomainParticipantQos & qos); - virtual - ::DDS::ReturnCode_t get_default_participant_qos (::DDS::DomainParticipantQos & qos); + virtual + ::DDS::ReturnCode_t get_default_participant_qos (::DDS::DomainParticipantQos & qos); - virtual - ::DDS::ReturnCode_t set_qos (const ::DDS::DomainParticipantFactoryQos & qos); + virtual + ::DDS::ReturnCode_t set_qos (const ::DDS::DomainParticipantFactoryQos & qos); - virtual - ::DDS::ReturnCode_t get_qos (::DDS::DomainParticipantFactoryQos & qos); + virtual + ::DDS::ReturnCode_t get_qos (::DDS::DomainParticipantFactoryQos & qos); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - virtual ::DDS::ReturnCode_t set_default_participant_qos_with_profile( - const char * library_name, - const char * profile_name); + virtual ::DDS::ReturnCode_t set_default_participant_qos_with_profile( + const char * library_name, + const char * profile_name); #endif - - private: - void remove_participant (RTI_DomainParticipant_i * part); - - TAO_SYNCH_MUTEX dps_mutex_; - typedef std::map<ACE_CString, RTI_DomainParticipant_i *> DomainParticipants; - DomainParticipants dps_; - private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const RTI_DomainParticipantFactory_i &)) - ACE_UNIMPLEMENTED_FUNC (RTI_DomainParticipantFactory_i (const RTI_DomainParticipantFactory_i &)) - }; - - typedef ACE_Singleton<RTI_DomainParticipantFactory_i, - TAO_SYNCH_MUTEX> Domain_Participant_Factory; - } + + private: + void remove_participant (CCM_DDS_DomainParticipant_i * part); + + TAO_SYNCH_MUTEX dps_mutex_; + typedef std::map<ACE_CString, CCM_DDS_DomainParticipant_i *> DomainParticipants; + DomainParticipants dps_; + private: + ACE_UNIMPLEMENTED_FUNC (void operator= (const CCM_DDS_DomainParticipantFactory_i &)) + ACE_UNIMPLEMENTED_FUNC (CCM_DDS_DomainParticipantFactory_i (const CCM_DDS_DomainParticipantFactory_i &)) + }; + + typedef ACE_Singleton<CCM_DDS_DomainParticipantFactory_i, + TAO_SYNCH_MUTEX> Domain_Participant_Factory; } } -#define DPFACTORY ::CIAO::DDS4CCM::RTI::Domain_Participant_Factory::instance () +#define DPFACTORY ::CIAO::DDS4CCM::Domain_Participant_Factory::instance () /// Declare a process wide singleton DDS4CCM_NDDS_IMPL_SINGLETON_DECLARE (ACE_Singleton, - ::CIAO::DDS4CCM::RTI::RTI_DomainParticipantFactory_i, + ::CIAO::DDS4CCM::CCM_DDS_DomainParticipantFactory_i, TAO_SYNCH_MUTEX) #endif diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp index e72fb21e497..828eda9a2b1 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp @@ -17,112 +17,109 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI - { - RTI_DomainParticipantListener_i::RTI_DomainParticipantListener_i ( - ::DDS::DomainParticipantListener_ptr p) - : impl_ (::DDS::DomainParticipantListener::_duplicate (p)) - { - } - - RTI_DomainParticipantListener_i::~RTI_DomainParticipantListener_i (void) - { - } - - void - RTI_DomainParticipantListener_i::on_inconsistent_topic ( - ::DDS::Topic_ptr, - const ::DDS::InconsistentTopicStatus & ) - { - } - - void - RTI_DomainParticipantListener_i::on_requested_deadline_missed ( - ::DDS::DataReader_ptr , - const ::DDS::RequestedDeadlineMissedStatus & ) - { - } - - void - RTI_DomainParticipantListener_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr , - const ::DDS::RequestedIncompatibleQosStatus & ) - { - } - - void - RTI_DomainParticipantListener_i::on_sample_rejected ( - ::DDS::DataReader_ptr , - const ::DDS::SampleRejectedStatus & ) - { - } - - void - RTI_DomainParticipantListener_i::on_liveliness_changed ( - ::DDS::DataReader_ptr , - const ::DDS::LivelinessChangedStatus & ) - { - } - - void - RTI_DomainParticipantListener_i::on_data_available ( - ::DDS::DataReader_ptr ) - { - } - - void - RTI_DomainParticipantListener_i::on_subscription_matched ( - ::DDS::DataReader_ptr , - const ::DDS::SubscriptionMatchedStatus & ) - { - } - - void - RTI_DomainParticipantListener_i::on_sample_lost ( - ::DDS::DataReader_ptr , - const ::DDS::SampleLostStatus & ) - { - } - - void - RTI_DomainParticipantListener_i::on_offered_deadline_missed ( - ::DDS::DataWriter_ptr , - const ::DDS::OfferedDeadlineMissedStatus & ) - { - } - - void - RTI_DomainParticipantListener_i::on_offered_incompatible_qos ( - ::DDS::DataWriter_ptr , - const ::DDS::OfferedIncompatibleQosStatus & ) - { - } - - void - RTI_DomainParticipantListener_i::on_liveliness_lost ( - ::DDS::DataWriter_ptr , - const ::DDS::LivelinessLostStatus & ) - { - } - - void - RTI_DomainParticipantListener_i::on_publication_matched ( - ::DDS::DataWriter_ptr , - const ::DDS::PublicationMatchedStatus & ) - { - } - - void - RTI_DomainParticipantListener_i::on_data_on_readers ( - ::DDS::Subscriber_ptr ) - { - } - - ::DDS::DomainParticipantListener_ptr - RTI_DomainParticipantListener_i::get_domainparticipantlistener (void) - { - return ::DDS::DomainParticipantListener::_duplicate (this->impl_.in ()); - } + CCM_DDS_DomainPublisherListener_i::CCM_DDS_DomainPublisherListener_i ( + ::DDS::DomainParticipantListener_ptr p) + : impl_ (::DDS::DomainParticipantListener::_duplicate (p)) + { + } + + CCM_DDS_DomainPublisherListener_i::~CCM_DDS_DomainPublisherListener_i (void) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_inconsistent_topic ( + ::DDS::Topic_ptr, + const ::DDS::InconsistentTopicStatus & ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_requested_deadline_missed ( + ::DDS::DataReader_ptr , + const ::DDS::RequestedDeadlineMissedStatus & ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_requested_incompatible_qos ( + ::DDS::DataReader_ptr , + const ::DDS::RequestedIncompatibleQosStatus & ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_sample_rejected ( + ::DDS::DataReader_ptr , + const ::DDS::SampleRejectedStatus & ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_liveliness_changed ( + ::DDS::DataReader_ptr , + const ::DDS::LivelinessChangedStatus & ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_data_available ( + ::DDS::DataReader_ptr ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_subscription_matched ( + ::DDS::DataReader_ptr , + const ::DDS::SubscriptionMatchedStatus & ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_sample_lost ( + ::DDS::DataReader_ptr , + const ::DDS::SampleLostStatus & ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_offered_deadline_missed ( + ::DDS::DataWriter_ptr , + const ::DDS::OfferedDeadlineMissedStatus & ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_offered_incompatible_qos ( + ::DDS::DataWriter_ptr , + const ::DDS::OfferedIncompatibleQosStatus & ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_liveliness_lost ( + ::DDS::DataWriter_ptr , + const ::DDS::LivelinessLostStatus & ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_publication_matched ( + ::DDS::DataWriter_ptr , + const ::DDS::PublicationMatchedStatus & ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_data_on_readers ( + ::DDS::Subscriber_ptr ) + { + } + + ::DDS::DomainParticipantListener_ptr + CCM_DDS_DomainPublisherListener_i::get_domainparticipantlistener (void) + { + return ::DDS::DomainParticipantListener::_duplicate (this->impl_.in ()); } } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h index e1e4db63589..45661c47ba7 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h @@ -27,87 +27,84 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DomainPublisherListener_i : + public virtual ::DDSDomainParticipantListener { - class DDS4CCM_NDDS_IMPL_Export RTI_DomainParticipantListener_i : - public virtual ::DDSDomainParticipantListener - { - public: - // Constructor - RTI_DomainParticipantListener_i (::DDS::DomainParticipantListener_ptr p); - - // Destructor - virtual ~RTI_DomainParticipantListener_i (void); - - ::DDS::DomainParticipantListener_ptr get_domainparticipantlistener (void); - - virtual void - on_inconsistent_topic ( - ::DDS::Topic_ptr, - const ::DDS::InconsistentTopicStatus & ); - - virtual void - on_requested_deadline_missed ( - ::DDS::DataReader_ptr , - const ::DDS::RequestedDeadlineMissedStatus & ); - - virtual void - on_requested_incompatible_qos ( - ::DDS::DataReader_ptr , - const ::DDS::RequestedIncompatibleQosStatus & ); - - virtual void - on_sample_rejected ( - ::DDS::DataReader_ptr , - const ::DDS::SampleRejectedStatus & ); - - virtual void - on_liveliness_changed ( - ::DDS::DataReader_ptr , - const ::DDS::LivelinessChangedStatus & ); - - virtual void - on_data_available ( - ::DDS::DataReader_ptr ); - - virtual void - on_subscription_matched ( - ::DDS::DataReader_ptr , - const ::DDS::SubscriptionMatchedStatus & ); - - virtual void - on_sample_lost ( - ::DDS::DataReader_ptr , - const ::DDS::SampleLostStatus & ); - - virtual void - on_offered_deadline_missed ( - ::DDS::DataWriter_ptr , - const ::DDS::OfferedDeadlineMissedStatus & ); - - virtual void - on_offered_incompatible_qos ( - ::DDS::DataWriter_ptr , - const ::DDS::OfferedIncompatibleQosStatus & ); - - virtual void - on_liveliness_lost ( - ::DDS::DataWriter_ptr , - const ::DDS::LivelinessLostStatus & ); - - virtual void - on_publication_matched ( - ::DDS::DataWriter_ptr , - const ::DDS::PublicationMatchedStatus & ); - - virtual void - on_data_on_readers ( - ::DDS::Subscriber_ptr ); - - private: - ::DDS::DomainParticipantListener_var impl_; - }; - } + public: + /// Constructor + CCM_DDS_DomainPublisherListener_i (::DDS::DomainParticipantListener_ptr p); + + /// Destructor + virtual ~CCM_DDS_DomainPublisherListener_i (void); + + ::DDS::DomainParticipantListener_ptr get_domainparticipantlistener (void); + + virtual void + on_inconsistent_topic ( + ::DDS::Topic_ptr, + const ::DDS::InconsistentTopicStatus & ); + + virtual void + on_requested_deadline_missed ( + ::DDS::DataReader_ptr , + const ::DDS::RequestedDeadlineMissedStatus & ); + + virtual void + on_requested_incompatible_qos ( + ::DDS::DataReader_ptr , + const ::DDS::RequestedIncompatibleQosStatus & ); + + virtual void + on_sample_rejected ( + ::DDS::DataReader_ptr , + const ::DDS::SampleRejectedStatus & ); + + virtual void + on_liveliness_changed ( + ::DDS::DataReader_ptr , + const ::DDS::LivelinessChangedStatus & ); + + virtual void + on_data_available ( + ::DDS::DataReader_ptr ); + + virtual void + on_subscription_matched ( + ::DDS::DataReader_ptr , + const ::DDS::SubscriptionMatchedStatus & ); + + virtual void + on_sample_lost ( + ::DDS::DataReader_ptr , + const ::DDS::SampleLostStatus & ); + + virtual void + on_offered_deadline_missed ( + ::DDS::DataWriter_ptr , + const ::DDS::OfferedDeadlineMissedStatus & ); + + virtual void + on_offered_incompatible_qos ( + ::DDS::DataWriter_ptr , + const ::DDS::OfferedIncompatibleQosStatus & ); + + virtual void + on_liveliness_lost ( + ::DDS::DataWriter_ptr , + const ::DDS::LivelinessLostStatus & ); + + virtual void + on_publication_matched ( + ::DDS::DataWriter_ptr , + const ::DDS::PublicationMatchedStatus & ); + + virtual void + on_data_on_readers ( + ::DDS::Subscriber_ptr ); + + private: + ::DDS::DomainParticipantListener_var impl_; + }; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp index 247a8eed7c9..edd62df7f26 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp @@ -226,7 +226,7 @@ CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::set_impl ( } else { - RTI_DataReader_i *rdr = dynamic_cast <RTI_DataReader_i *> (reader); + CCM_DDS_DataReader_i *rdr = dynamic_cast <CCM_DDS_DataReader_i *> (reader); if (!rdr) { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Getter_Base_T::data_reader - " diff --git a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp index d2758d1374f..9eff3682e48 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp @@ -6,20 +6,20 @@ #include "dds4ccm/impl/logger/Log_Macros.h" template <typename DDS_TYPE, typename CCM_TYPE, typename BASE_TYPE> -CIAO::DDS4CCM::RTI::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::InstanceHandleManager_T (void) +CIAO::DDS4CCM::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::InstanceHandleManager_T (void) : impl_ (0) { } template <typename DDS_TYPE, typename CCM_TYPE, typename BASE_TYPE> -CIAO::DDS4CCM::RTI::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::~InstanceHandleManager_T (void) +CIAO::DDS4CCM::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::~InstanceHandleManager_T (void) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::InstanceHandleManager_T::~InstanceHandleManager_T"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::InstanceHandleManager_T::~InstanceHandleManager_T"); } template <typename DDS_TYPE, typename CCM_TYPE, typename BASE_TYPE> typename DDS_TYPE::data_writer * -CIAO::DDS4CCM::RTI::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::impl (void) +CIAO::DDS4CCM::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::impl (void) { if (this->impl_) { @@ -33,7 +33,7 @@ CIAO::DDS4CCM::RTI::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::impl template <typename DDS_TYPE, typename CCM_TYPE, typename BASE_TYPE> ::DDS::InstanceHandle_t -CIAO::DDS4CCM::RTI::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>:: +CIAO::DDS4CCM::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>:: register_instance (const typename DDS_TYPE::value_type & datum) { ::DDS::InstanceHandle_t dds_handle; @@ -44,7 +44,7 @@ CIAO::DDS4CCM::RTI::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>:: template <typename DDS_TYPE, typename CCM_TYPE, typename BASE_TYPE> void -CIAO::DDS4CCM::RTI::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::unregister_instance ( +CIAO::DDS4CCM::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::unregister_instance ( const typename DDS_TYPE::value_type & datum, const ::DDS::InstanceHandle_t & instance_handle) { @@ -55,10 +55,10 @@ CIAO::DDS4CCM::RTI::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::unre template <typename DDS_TYPE, typename CCM_TYPE, typename BASE_TYPE> void -CIAO::DDS4CCM::RTI::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::set_impl ( +CIAO::DDS4CCM::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::set_impl ( ::DDS::DataWriter_ptr writer) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::InstanceHandleManager_T::set_impl"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::InstanceHandleManager_T::set_impl"); if (::CORBA::is_nil (writer)) { @@ -66,11 +66,11 @@ CIAO::DDS4CCM::RTI::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::set_ } else { - RTI_DataWriter_i *rdw = dynamic_cast <RTI_DataWriter_i *> (writer); + CCM_DDS_DataWriter_i *rdw = dynamic_cast <CCM_DDS_DataWriter_i *> (writer); if (rdw == 0) { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::InstanceHandleManager_T::data_writer - " + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::InstanceHandleManager_T::data_writer - " "Unable to cast provided DataWriter to servant\n")); throw ::CORBA::INTERNAL (); } @@ -79,7 +79,7 @@ CIAO::DDS4CCM::RTI::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::set_ if (!this->impl_) { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::InstanceHandleManager_T::data_writer - " + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::InstanceHandleManager_T::data_writer - " "Unable to narrow the provided writer entity to the specific " "type necessary to publish messages\n")); throw ::CORBA::INTERNAL (); diff --git a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h index ed1e48ee1a2..a232161c718 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h @@ -16,36 +16,33 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + template <typename DDS_TYPE, typename CCM_TYPE, typename BASE_TYPE> + class InstanceHandleManager_T : + public virtual BASE_TYPE, + public virtual ::CORBA::LocalObject, + private virtual ACE_Copy_Disabled { - template <typename DDS_TYPE, typename CCM_TYPE, typename BASE_TYPE> - class InstanceHandleManager_T : - public virtual BASE_TYPE, - public virtual ::CORBA::LocalObject, - private virtual ACE_Copy_Disabled - { - public: - /// Constructor - InstanceHandleManager_T (void); - - /// Destructor - virtual ~InstanceHandleManager_T (void); - - virtual ::DDS::InstanceHandle_t register_instance ( - const typename DDS_TYPE::value_type & datum); - - virtual void unregister_instance ( - const typename DDS_TYPE::value_type & datum, - const ::DDS::InstanceHandle_t & instance_handle); - - void set_impl (::DDS::DataWriter_ptr writer); - - typename DDS_TYPE::data_writer * impl (void); - - private: - typename DDS_TYPE::data_writer *impl_; - }; - } + public: + /// Constructor + InstanceHandleManager_T (void); + + /// Destructor + virtual ~InstanceHandleManager_T (void); + + virtual ::DDS::InstanceHandle_t register_instance ( + const typename DDS_TYPE::value_type & datum); + + virtual void unregister_instance ( + const typename DDS_TYPE::value_type & datum, + const ::DDS::InstanceHandle_t & instance_handle); + + void set_impl (::DDS::DataWriter_ptr writer); + + typename DDS_TYPE::data_writer * impl (void); + + private: + typename DDS_TYPE::data_writer *impl_; + }; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp index 9f88431cfab..7156450762d 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp @@ -19,388 +19,384 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + CCM_DDS_Publisher_i::CCM_DDS_Publisher_i (DDSPublisher * dw) + : impl_ (dw) { - RTI_Publisher_i::RTI_Publisher_i (void) - : impl_ (0) - { - DDS4CCM_TRACE ("RTI_Publisher_i::RTI_Publisher_i"); - } - - RTI_Publisher_i::~RTI_Publisher_i (void) - { - DDS4CCM_TRACE ("RTI_Publisher_i::~RTI_Publisher_i"); - } - - ::DDS::DataWriter_ptr - RTI_Publisher_i::create_datawriter (::DDS::Topic_ptr a_topic, - const ::DDS::DataWriterQos & qos, - ::DDS::DataWriterListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("RTI_Publisher_i::create_datawriter"); + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::CCM_DDS_Publisher_i"); + } + + CCM_DDS_Publisher_i::~CCM_DDS_Publisher_i (void) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::~CCM_DDS_Publisher_i"); + } + + ::DDS::DataWriter_ptr + CCM_DDS_Publisher_i::create_datawriter (::DDS::Topic_ptr a_topic, + const ::DDS::DataWriterQos & qos, + ::DDS::DataWriterListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::create_datawriter"); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ACE_UNUSED_ARG (qos); + + CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic); + + if (!topic) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::create_datawriter - " + "Error: Unable to cast provided topic to its servant.\n")); + throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); + } + + ::DDS::DataWriter_var retval = ::DDS::DataWriter::_nil (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DataWriter_i (), + CORBA::NO_MEMORY ()); + + DDSDataWriterListener *rti_drl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_drl, + CCM_DDS_DataWriterListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + DDS_DataWriterQos rti_qos = DDS_DATAWRITER_QOS_DEFAULT; + DDSDataWriter *rti_dw = this->impl ()->create_datawriter ( + topic->get_impl (), + rti_qos, + rti_drl, + mask); + + if (!rti_dw) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::create_datawriter - " + "Error: RTI Topic returned a nil datawriter.\n")); + delete rti_drl; + throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + } + + rti_dw->enable (); + CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (retval.in ()); + dw->set_impl (rti_dw); + + return retval._retn (); +#else + return this->impl ()->create_datawriter ( + a_topic, + qos, + a_listener, + mask); +#endif + } #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ACE_UNUSED_ARG (qos); - - CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic); - - if (!topic) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_Publisher_i::create_datawriter - " - "Error: Unable to cast provided topic to its servant.\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); - } - - ::DDS::DataWriter_var retval = ::DDS::DataWriter::_nil (); - ACE_NEW_THROW_EX (retval, - RTI_DataWriter_i (), - CORBA::NO_MEMORY ()); - - DDSDataWriterListener *rti_drl = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (rti_drl, - RTI_DataWriterListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - DDS_DataWriterQos rti_qos = DDS_DATAWRITER_QOS_DEFAULT; - DDSDataWriter *rti_dw = this->impl ()->create_datawriter ( + ::DDS::DataWriter_ptr + CCM_DDS_Publisher_i::create_datawriter_with_profile (::DDS::Topic_ptr a_topic, + const char* library_name, + const char *profile_name, + ::DDS::DataWriterListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::create_datawriter"); + + CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic); + + if (!topic) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::create_datawriter_with_profile - " + "Error: Unable to cast provided topic to its servant.\n")); + throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); + } + + ::DDS::DataWriter_var retval = ::DDS::DataWriter::_nil (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DataWriter_i (), + CORBA::NO_MEMORY ()); + + DDSDataWriterListener *rti_drl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_drl, + CCM_DDS_DataWriterListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + DDSDataWriter *rti_dw = this->impl ()->create_datawriter_with_profile ( topic->get_impl (), - rti_qos, + library_name, + profile_name, rti_drl, mask); - if (!rti_dw) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_Publisher_i::create_datawriter - " - "Error: RTI Topic returned a nil datawriter.\n")); - delete rti_drl; - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - - rti_dw->enable (); - RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (retval.in ()); - dw->set_impl (rti_dw); + if (!rti_dw) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::create_datawriter_with_profile - " + "Error: RTI Topic returned a nil datawriter.\n")); + delete rti_drl; + throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + } - return retval._retn (); -#else - return this->impl ()->create_datawriter ( - a_topic, - qos, - a_listener, - mask); -#endif - } + rti_dw->enable (); + CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (retval.in ()); + dw->set_impl (rti_dw); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::DataWriter_ptr - RTI_Publisher_i::create_datawriter_with_profile (::DDS::Topic_ptr a_topic, - const char* library_name, - const char *profile_name, - ::DDS::DataWriterListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("RTI_Publisher_i::create_datawriter"); - - CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic); - - if (!topic) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_Publisher_i::create_datawriter_with_profile - " - "Error: Unable to cast provided topic to its servant.\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); - } - - ::DDS::DataWriter_var retval = ::DDS::DataWriter::_nil (); - ACE_NEW_THROW_EX (retval, - RTI_DataWriter_i (), - CORBA::NO_MEMORY ()); - - DDSDataWriterListener *rti_drl = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (rti_drl, - RTI_DataWriterListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - DDSDataWriter *rti_dw = this->impl ()->create_datawriter_with_profile ( - topic->get_impl (), - library_name, - profile_name, - rti_drl, - mask); - - if (!rti_dw) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_Publisher_i::create_datawriter_with_profile - " - "Error: RTI Topic returned a nil datawriter.\n")); - delete rti_drl; - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - - rti_dw->enable (); - RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (retval.in ()); - dw->set_impl (rti_dw); - - return retval._retn (); - } + return retval._retn (); + } #endif - ::DDS::ReturnCode_t - RTI_Publisher_i::delete_datawriter (::DDS::DataWriter_ptr a_datawriter) - { - DDS4CCM_TRACE ("RTI_Publisher_i::delete_datawriter"); + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::delete_datawriter (::DDS::DataWriter_ptr a_datawriter) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::delete_datawriter"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - RTI_DataWriter_i *top = dynamic_cast< RTI_DataWriter_i *> (a_datawriter); - - if (top == 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_Publisher_i::delete_datawriter - " - "Unable to cast provided object reference to servant.\n")); - return ::DDS::RETCODE_BAD_PARAMETER; - } - - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "RTI_Publisher_i::delete_datawriter - " - "Successfully casted provided object reference to servant.\n")); - - DDS_ReturnCode_t const retval = this->impl ()->delete_datawriter (top->get_impl ()); - - if (retval != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_Publisher_i::delete_datawriter - " - "Error: RTI delete_datawriter returned non-ok error code %C\n", - translate_retcode (retval))); - } - else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "RTI_Publisher_i::delete_datawriter - " - "Provided datawriter successfully deleted\n")); - - return retval; + CCM_DDS_DataWriter_i *top = dynamic_cast< CCM_DDS_DataWriter_i *> (a_datawriter); + + if (top == 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::delete_datawriter - " + "Unable to cast provided object reference to servant.\n")); + return ::DDS::RETCODE_BAD_PARAMETER; + } + + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_Publisher_i::delete_datawriter - " + "Successfully casted provided object reference to servant.\n")); + + DDS_ReturnCode_t const retval = this->impl ()->delete_datawriter (top->get_impl ()); + + if (retval != DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::delete_datawriter - " + "Error: RTI delete_datawriter returned non-ok error code %C\n", + translate_retcode (retval))); + } + else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_Publisher_i::delete_datawriter - " + "Provided datawriter successfully deleted\n")); + + return retval; #else - return this->impl ()->delete_datawriter (a_datawriter); + return this->impl ()->delete_datawriter (a_datawriter); #endif - } + } - ::DDS::DataWriter_ptr - RTI_Publisher_i::lookup_datawriter (const char * impl_name) - { + ::DDS::DataWriter_ptr + CCM_DDS_Publisher_i::lookup_datawriter (const char * impl_name) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::DataWriter_var retval = ::DDS::DataWriter::_nil (); - ACE_NEW_THROW_EX (retval, - RTI_DataWriter_i (), - CORBA::NO_MEMORY ()); - DDSDataWriter* dw = this->impl ()->lookup_datawriter (impl_name); - RTI_DataWriter_i *rti_dw = dynamic_cast< RTI_DataWriter_i * > (retval.in ()); - rti_dw->set_impl (dw); - return retval._retn (); + ::DDS::DataWriter_var retval = ::DDS::DataWriter::_nil (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DataWriter_i (), + CORBA::NO_MEMORY ()); + DDSDataWriter* dw = this->impl ()->lookup_datawriter (impl_name); + CCM_DDS_DataWriter_i *rti_dw = dynamic_cast< CCM_DDS_DataWriter_i * > (retval.in ()); + rti_dw->set_impl (dw); + return retval._retn (); #else - return this->impl ()->lookup_datawriter (impl_name); + return this->impl ()->lookup_datawriter (impl_name); #endif - } - - ::DDS::ReturnCode_t - RTI_Publisher_i::delete_contained_entities (void) - { - return this->impl ()->delete_contained_entities (); - } - - ::DDS::ReturnCode_t - RTI_Publisher_i::set_qos (const ::DDS::PublisherQos & /*qos*/) - { - DDS4CCM_TRACE ("RTI_Publisher_i::set_qos"); - throw CORBA::NO_IMPLEMENT (); - } - - ::DDS::ReturnCode_t - RTI_Publisher_i::get_qos (::DDS::PublisherQos & /* qos*/) - { - DDS4CCM_TRACE ("RTI_Publisher_i::get_qos"); - throw CORBA::NO_IMPLEMENT (); - } - - ::DDS::ReturnCode_t - RTI_Publisher_i::set_listener (::DDS::PublisherListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("RTI_Publisher_i::set_listener"); + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::delete_contained_entities (void) + { + return this->impl ()->delete_contained_entities (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::set_qos (const ::DDS::PublisherQos & /*qos*/) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::set_qos"); + throw CORBA::NO_IMPLEMENT (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::get_qos (::DDS::PublisherQos & /* qos*/) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::get_qos"); + throw CORBA::NO_IMPLEMENT (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::set_listener (::DDS::PublisherListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::set_listener"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - RTI_PublisherListener_i *rti_impl_list = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (rti_impl_list, - RTI_PublisherListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - return this->impl ()->set_listener (rti_impl_list, mask); + CCM_DDS_PublisherListener_i *rti_impl_list = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_impl_list, + CCM_DDS_PublisherListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + return this->impl ()->set_listener (rti_impl_list, mask); #else - return this->impl ()->set_listener (a_listener, mask); + return this->impl ()->set_listener (a_listener, mask); #endif - } + } - ::DDS::PublisherListener_ptr - RTI_Publisher_i::get_listener (void) - { - DDS4CCM_TRACE ("RTI_Publisher_i::get_listener"); + ::DDS::PublisherListener_ptr + CCM_DDS_Publisher_i::get_listener (void) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::get_listener"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSPublisherListener *rti_pub_list = this->impl ()->get_listener (); - RTI_PublisherListener_i *list_proxy = dynamic_cast <RTI_PublisherListener_i *> (rti_pub_list); - if (!list_proxy) - { - DDS4CCM_DEBUG (6, (LM_DEBUG, "RTI_Publisher_i::get_listener - " - "DDS returned a NIL listener.\n")); - return ::DDS::PublisherListener::_nil (); - } - return list_proxy->get_publisher_listener (); + DDSPublisherListener *rti_pub_list = this->impl ()->get_listener (); + CCM_DDS_PublisherListener_i *list_proxy = dynamic_cast <CCM_DDS_PublisherListener_i *> (rti_pub_list); + if (!list_proxy) + { + DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_Publisher_i::get_listener - " + "DDS returned a NIL listener.\n")); + return ::DDS::PublisherListener::_nil (); + } + return list_proxy->get_publisher_listener (); #else - return this->impl ()->get_listener (); + return this->impl ()->get_listener (); #endif - } - - ::DDS::ReturnCode_t - RTI_Publisher_i::suspend_publications (void) - { - return this->impl ()->suspend_publications (); - } - - ::DDS::ReturnCode_t - RTI_Publisher_i::resume_publications (void) - { - return this->impl ()->resume_publications (); - } - - ::DDS::ReturnCode_t - RTI_Publisher_i::begin_coherent_changes (void) - { - return this->impl ()->begin_coherent_changes (); - } - - ::DDS::ReturnCode_t - RTI_Publisher_i::end_coherent_changes (void) - { - return this->impl ()->end_coherent_changes (); - } - - ::DDS::ReturnCode_t - RTI_Publisher_i::wait_for_acknowledgments (const ::DDS::Duration_t & max_wait) - { + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::suspend_publications (void) + { + return this->impl ()->suspend_publications (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::resume_publications (void) + { + return this->impl ()->resume_publications (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::begin_coherent_changes (void) + { + return this->impl ()->begin_coherent_changes (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::end_coherent_changes (void) + { + return this->impl ()->end_coherent_changes (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::wait_for_acknowledgments (const ::DDS::Duration_t & max_wait) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_Duration_t rti_dds_duration; - rti_dds_duration <<= max_wait; - return this->impl ()->wait_for_acknowledgments (rti_dds_duration); + DDS_Duration_t rti_dds_duration; + rti_dds_duration <<= max_wait; + return this->impl ()->wait_for_acknowledgments (rti_dds_duration); #else - return this->impl ()->wait_for_acknowledgments (max_wait); + return this->impl ()->wait_for_acknowledgments (max_wait); #endif - } + } - ::DDS::DomainParticipant_ptr - RTI_Publisher_i::get_participant (void) - { - DDS4CCM_TRACE ("RTI_Publisher_i::get_participant"); + ::DDS::DomainParticipant_ptr + CCM_DDS_Publisher_i::get_participant (void) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::get_participant"); + ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); - ACE_NEW_THROW_EX (retval, - RTI_DomainParticipant_i (), - CORBA::NO_MEMORY ()); - - DDSDomainParticipant* p = this->impl ()->get_participant (); - RTI_DomainParticipant_i *rti_dp = dynamic_cast < RTI_DomainParticipant_i *> (retval.in ()); - rti_dp->set_impl (p); - return retval._retn (); + DDSDomainParticipant* p = this->impl ()->get_participant (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (p), + CORBA::NO_MEMORY ()); #else - return this->impl ()->get_participant (); + ::DDS::DomainParticipant_var p = this->impl ()->get_participant (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (p.in ()), + CORBA::NO_MEMORY ()); #endif - } - - ::DDS::ReturnCode_t - RTI_Publisher_i::set_default_datawriter_qos (const ::DDS::DataWriterQos & /*qos*/) - { - DDS4CCM_TRACE ("RTI_Publisher_i::set_default_datawriter_qos"); - throw CORBA::NO_IMPLEMENT (); - } - - ::DDS::ReturnCode_t - RTI_Publisher_i::get_default_datawriter_qos (::DDS::DataWriterQos & /*qos*/) - { - DDS4CCM_TRACE ("RTI_Publisher_i::get_default_datawriter_qos"); - throw CORBA::NO_IMPLEMENT (); - } - - ::DDS::ReturnCode_t - RTI_Publisher_i::copy_from_topic_qos (::DDS::DataWriterQos & /*a_dataimpl_qos*/, - const ::DDS::TopicQos & /*a_impl_qos*/) - { - DDS4CCM_TRACE ("RTI_Publisher_i::copy_from_topic_qos"); - throw CORBA::NO_IMPLEMENT (); - } - - ::DDS::ReturnCode_t - RTI_Publisher_i::enable (void) - { - return this->impl ()->enable (); - } - - ::DDS::StatusCondition_ptr - RTI_Publisher_i::get_statuscondition (void) - { - ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); + return retval._retn (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::set_default_datawriter_qos (const ::DDS::DataWriterQos & /*qos*/) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::set_default_datawriter_qos"); + throw CORBA::NO_IMPLEMENT (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::get_default_datawriter_qos (::DDS::DataWriterQos & /*qos*/) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::get_default_datawriter_qos"); + throw CORBA::NO_IMPLEMENT (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::copy_from_topic_qos (::DDS::DataWriterQos & /*a_dataimpl_qos*/, + const ::DDS::TopicQos & /*a_impl_qos*/) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::copy_from_topic_qos"); + throw CORBA::NO_IMPLEMENT (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::enable (void) + { + return this->impl ()->enable (); + } + + ::DDS::StatusCondition_ptr + CCM_DDS_Publisher_i::get_statuscondition (void) + { + ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSStatusCondition* sc = this->impl ()->get_statuscondition (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc), - CORBA::NO_MEMORY ()); + DDSStatusCondition* sc = this->impl ()->get_statuscondition (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc), + CORBA::NO_MEMORY ()); #else - ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc.in ()), - CORBA::NO_MEMORY ()); + ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc.in ()), + CORBA::NO_MEMORY ()); #endif - return retval._retn (); - } - - ::DDS::StatusMask - RTI_Publisher_i::get_status_changes (void) - { - return this->impl ()->get_status_changes (); - } - - ::DDS::InstanceHandle_t - RTI_Publisher_i::get_instance_handle (void) - { + return retval._retn (); + } + + ::DDS::StatusMask + CCM_DDS_Publisher_i::get_status_changes (void) + { + return this->impl ()->get_status_changes (); + } + + ::DDS::InstanceHandle_t + CCM_DDS_Publisher_i::get_instance_handle (void) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); - ::DDS::InstanceHandle_t handle; - handle <<= rtihandle; - return handle; + ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); + ::DDS::InstanceHandle_t handle; + handle <<= rtihandle; + return handle; #else - return this->impl ()->get_instance_handle (); + return this->impl ()->get_instance_handle (); #endif - } - - DDSPublisher * - RTI_Publisher_i::get_impl (void) - { - return this->impl_; - } - - void - RTI_Publisher_i::set_impl (DDSPublisher * dw) - { - this->impl_ = dw; - } - - DDSPublisher * - RTI_Publisher_i::impl (void) - { - if (!this->impl_) - { - throw ::CORBA::BAD_INV_ORDER (); - } - return this->impl_; - } + } + + DDSPublisher * + CCM_DDS_Publisher_i::get_impl (void) + { + return this->impl_; + } + void + CCM_DDS_Publisher_i::set_impl (DDSPublisher * dw) + { + this->impl_ = dw; + } + + DDSPublisher * + CCM_DDS_Publisher_i::impl (void) + { + if (!this->impl_) + { + throw ::CORBA::BAD_INV_ORDER (); + } + return this->impl_; } } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h index da2a338e9b6..24d218429a3 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h @@ -31,104 +31,101 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_Publisher_i : + public virtual ::DDS::CCM_Publisher, + public virtual ::CORBA::LocalObject { - class DDS4CCM_NDDS_IMPL_Export RTI_Publisher_i : - public virtual ::DDS::CCM_Publisher, - public virtual ::CORBA::LocalObject - { - public: - // Constructor - RTI_Publisher_i (void); + public: + /// Constructor + CCM_DDS_Publisher_i (DDSPublisher * dw); - // Destructor - virtual ~RTI_Publisher_i (void); + /// Destructor + virtual ~CCM_DDS_Publisher_i (void); - virtual - ::DDS::DataWriter_ptr create_datawriter (::DDS::Topic_ptr a_topic, - const ::DDS::DataWriterQos & qos, - ::DDS::DataWriterListener_ptr a_listener, - ::DDS::StatusMask mask); + virtual + ::DDS::DataWriter_ptr create_datawriter (::DDS::Topic_ptr a_topic, + const ::DDS::DataWriterQos & qos, + ::DDS::DataWriterListener_ptr a_listener, + ::DDS::StatusMask mask); - virtual - ::DDS::DataWriter_ptr create_datawriter_with_profile (::DDS::Topic_ptr a_topic, - const char* library_name, - const char *profile_name, - ::DDS::DataWriterListener_ptr a_listener, - ::DDS::StatusMask mask); + virtual + ::DDS::DataWriter_ptr create_datawriter_with_profile (::DDS::Topic_ptr a_topic, + const char* library_name, + const char *profile_name, + ::DDS::DataWriterListener_ptr a_listener, + ::DDS::StatusMask mask); - virtual - ::DDS::ReturnCode_t delete_datawriter (::DDS::DataWriter_ptr a_datawriter); + virtual + ::DDS::ReturnCode_t delete_datawriter (::DDS::DataWriter_ptr a_datawriter); - virtual - ::DDS::DataWriter_ptr lookup_datawriter (const char * impl_name); + virtual + ::DDS::DataWriter_ptr lookup_datawriter (const char * impl_name); - virtual - ::DDS::ReturnCode_t delete_contained_entities (void); + virtual + ::DDS::ReturnCode_t delete_contained_entities (void); - virtual - ::DDS::ReturnCode_t set_qos (const ::DDS::PublisherQos & qos); + virtual + ::DDS::ReturnCode_t set_qos (const ::DDS::PublisherQos & qos); - virtual - ::DDS::ReturnCode_t get_qos (::DDS::PublisherQos & qos); + virtual + ::DDS::ReturnCode_t get_qos (::DDS::PublisherQos & qos); - virtual - ::DDS::ReturnCode_t set_listener (::DDS::PublisherListener_ptr a_listener, - ::DDS::StatusMask mask); + virtual + ::DDS::ReturnCode_t set_listener (::DDS::PublisherListener_ptr a_listener, + ::DDS::StatusMask mask); - virtual - ::DDS::PublisherListener_ptr get_listener (void); + virtual + ::DDS::PublisherListener_ptr get_listener (void); - virtual - ::DDS::ReturnCode_t suspend_publications (void); + virtual + ::DDS::ReturnCode_t suspend_publications (void); - virtual - ::DDS::ReturnCode_t resume_publications (void); + virtual + ::DDS::ReturnCode_t resume_publications (void); - virtual - ::DDS::ReturnCode_t begin_coherent_changes (void); + virtual + ::DDS::ReturnCode_t begin_coherent_changes (void); - virtual - ::DDS::ReturnCode_t end_coherent_changes (void); + virtual + ::DDS::ReturnCode_t end_coherent_changes (void); - virtual - ::DDS::ReturnCode_t wait_for_acknowledgments (const ::DDS::Duration_t & max_wait); + virtual + ::DDS::ReturnCode_t wait_for_acknowledgments (const ::DDS::Duration_t & max_wait); - virtual - ::DDS::DomainParticipant_ptr get_participant (void); + virtual + ::DDS::DomainParticipant_ptr get_participant (void); - virtual - ::DDS::ReturnCode_t set_default_datawriter_qos (const ::DDS::DataWriterQos & qos); + virtual + ::DDS::ReturnCode_t set_default_datawriter_qos (const ::DDS::DataWriterQos & qos); - virtual - ::DDS::ReturnCode_t get_default_datawriter_qos (::DDS::DataWriterQos & qos); + virtual + ::DDS::ReturnCode_t get_default_datawriter_qos (::DDS::DataWriterQos & qos); - virtual - ::DDS::ReturnCode_t copy_from_topic_qos (::DDS::DataWriterQos & a_dataimpl_qos, - const ::DDS::TopicQos & a_impl_qos); + virtual + ::DDS::ReturnCode_t copy_from_topic_qos (::DDS::DataWriterQos & a_dataimpl_qos, + const ::DDS::TopicQos & a_impl_qos); - virtual - ::DDS::ReturnCode_t enable (void); + virtual + ::DDS::ReturnCode_t enable (void); - virtual - ::DDS::StatusCondition_ptr get_statuscondition (void); + virtual + ::DDS::StatusCondition_ptr get_statuscondition (void); - virtual - ::DDS::StatusMask get_status_changes (void); + virtual + ::DDS::StatusMask get_status_changes (void); - virtual - ::DDS::InstanceHandle_t get_instance_handle (void); + virtual + ::DDS::InstanceHandle_t get_instance_handle (void); - DDSPublisher * get_impl (void); + DDSPublisher * get_impl (void); - void set_impl (DDSPublisher *p); + void set_impl (DDSPublisher *p); - private: - DDSPublisher *impl_; + private: + DDSPublisher *impl_; - DDSPublisher *impl (void); - }; - } + DDSPublisher *impl (void); + }; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp index ee06aeeebba..7413b5c0945 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp @@ -15,104 +15,101 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + CCM_DDS_PublisherListener_i::CCM_DDS_PublisherListener_i ( ::DDS::PublisherListener_ptr p) + : impl_ (::DDS::PublisherListener::_duplicate (p)) { - RTI_PublisherListener_i::RTI_PublisherListener_i ( ::DDS::PublisherListener_ptr p) - : impl_ (::DDS::PublisherListener::_duplicate (p)) - { - DDS4CCM_TRACE ("RTI_PublisherListener_i::RTI_PublisherListener_i"); - } + DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::CCM_DDS_PublisherListener_i"); + } - RTI_PublisherListener_i::~RTI_PublisherListener_i (void) - { - DDS4CCM_TRACE ("RTI_PublisherListener_i::~RTI_PublisherListener_i"); - } + CCM_DDS_PublisherListener_i::~CCM_DDS_PublisherListener_i (void) + { + DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::~CCM_DDS_PublisherListener_i"); + } - void - RTI_PublisherListener_i::on_offered_deadline_missed ( - ::DDSDataWriter* writer, - const ::DDS_OfferedDeadlineMissedStatus & status) - { - DDS4CCM_TRACE ("RTI_PublisherListener_i::on_offered_deadline_missed"); + void + CCM_DDS_PublisherListener_i::on_offered_deadline_missed ( + ::DDSDataWriter* writer, + const ::DDS_OfferedDeadlineMissedStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::on_offered_deadline_missed"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::OfferedDeadlineMissedStatus ddsstatus; - ddsstatus <<= status; - ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); - ACE_NEW (dds_writer, RTI_DataWriter_i ()); - RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ()); - dw->set_impl (writer); - this->impl_->on_offered_deadline_missed (dds_writer.in (), ddsstatus); + ::DDS::OfferedDeadlineMissedStatus ddsstatus; + ddsstatus <<= status; + ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); + ACE_NEW (dds_writer, CCM_DDS_DataWriter_i ()); + CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (dds_writer.in ()); + dw->set_impl (writer); + this->impl_->on_offered_deadline_missed (dds_writer.in (), ddsstatus); #else - this->impl_->on_offered_deadline_missed (writer, status); + this->impl_->on_offered_deadline_missed (writer, status); #endif - } + } - void - RTI_PublisherListener_i::on_offered_incompatible_qos ( - ::DDSDataWriter* writer, - const ::DDS_OfferedIncompatibleQosStatus & status) - { - DDS4CCM_TRACE ("RTI_PublisherListener_i::on_offered_incompatible_qos"); + void + CCM_DDS_PublisherListener_i::on_offered_incompatible_qos ( + ::DDSDataWriter* writer, + const ::DDS_OfferedIncompatibleQosStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::on_offered_incompatible_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::OfferedIncompatibleQosStatus ddsstatus; - ddsstatus <<= status; - ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); - ACE_NEW (dds_writer, RTI_DataWriter_i ()); - RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ()); - dw->set_impl (writer); - this->impl_->on_offered_incompatible_qos (dds_writer.in (), ddsstatus); + ::DDS::OfferedIncompatibleQosStatus ddsstatus; + ddsstatus <<= status; + ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); + ACE_NEW (dds_writer, CCM_DDS_DataWriter_i ()); + CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (dds_writer.in ()); + dw->set_impl (writer); + this->impl_->on_offered_incompatible_qos (dds_writer.in (), ddsstatus); #else - this->impl_->on_offered_incompatible_qos (writer, status); + this->impl_->on_offered_incompatible_qos (writer, status); #endif - } + } - void - RTI_PublisherListener_i::on_liveliness_lost ( - ::DDSDataWriter* writer, - const ::DDS_LivelinessLostStatus & status) - { - DDS4CCM_TRACE ("RTI_PublisherListener_i::on_liveliness_lost"); + void + CCM_DDS_PublisherListener_i::on_liveliness_lost ( + ::DDSDataWriter* writer, + const ::DDS_LivelinessLostStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::on_liveliness_lost"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::LivelinessLostStatus ddsstatus; - ddsstatus <<= status; - ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); - ACE_NEW (dds_writer, RTI_DataWriter_i ()); - RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ()); - dw->set_impl (writer); - this->impl_->on_liveliness_lost (dds_writer.in (), ddsstatus); + ::DDS::LivelinessLostStatus ddsstatus; + ddsstatus <<= status; + ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); + ACE_NEW (dds_writer, CCM_DDS_DataWriter_i ()); + CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (dds_writer.in ()); + dw->set_impl (writer); + this->impl_->on_liveliness_lost (dds_writer.in (), ddsstatus); #else - this->impl_->on_liveliness_lost (writer, status); + this->impl_->on_liveliness_lost (writer, status); #endif - } + } - void - RTI_PublisherListener_i::on_publication_matched ( - ::DDSDataWriter* writer, - const ::DDS_PublicationMatchedStatus & status) - { - DDS4CCM_TRACE ("RTI_PublisherListener_i::on_publication_matched"); + void + CCM_DDS_PublisherListener_i::on_publication_matched ( + ::DDSDataWriter* writer, + const ::DDS_PublicationMatchedStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::on_publication_matched"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::PublicationMatchedStatus ddsstatus; - ddsstatus <<= status; - ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); - ACE_NEW (dds_writer, RTI_DataWriter_i ()); - RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ()); - dw->set_impl (writer); - this->impl_->on_publication_matched (dds_writer.in (), ddsstatus); + ::DDS::PublicationMatchedStatus ddsstatus; + ddsstatus <<= status; + ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); + ACE_NEW (dds_writer, CCM_DDS_DataWriter_i ()); + CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (dds_writer.in ()); + dw->set_impl (writer); + this->impl_->on_publication_matched (dds_writer.in (), ddsstatus); #else - this->impl_->on_publication_matched (writer, status); + this->impl_->on_publication_matched (writer, status); #endif - } + } - ::DDS::PublisherListener_ptr - RTI_PublisherListener_i::get_publisher_listener (void) - { - return ::DDS::PublisherListener::_duplicate (this->impl_.in ()); - } + ::DDS::PublisherListener_ptr + CCM_DDS_PublisherListener_i::get_publisher_listener (void) + { + return ::DDS::PublisherListener::_duplicate (this->impl_.in ()); } } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h index 2bee931dace..84eee618d5a 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h @@ -36,43 +36,40 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_PublisherListener_i : + public virtual ::DDSPublisherListener { - class DDS4CCM_NDDS_IMPL_Export RTI_PublisherListener_i : - public virtual ::DDSPublisherListener - { - public: - // Constructor - RTI_PublisherListener_i (::DDS::PublisherListener_ptr p); + public: + /// Constructor + CCM_DDS_PublisherListener_i (::DDS::PublisherListener_ptr p); - // Destructor - virtual ~RTI_PublisherListener_i (void); + /// Destructor + virtual ~CCM_DDS_PublisherListener_i (void); - virtual void - on_offered_deadline_missed ( - ::DDSDataWriter *writer, - const ::DDS_OfferedDeadlineMissedStatus & status); + virtual void + on_offered_deadline_missed ( + ::DDSDataWriter *writer, + const ::DDS_OfferedDeadlineMissedStatus & status); - virtual void - on_offered_incompatible_qos ( - ::DDSDataWriter *writer, - const ::DDS_OfferedIncompatibleQosStatus & status); + virtual void + on_offered_incompatible_qos ( + ::DDSDataWriter *writer, + const ::DDS_OfferedIncompatibleQosStatus & status); - virtual void - on_liveliness_lost ( - ::DDSDataWriter* writer, - const ::DDS_LivelinessLostStatus & status); + virtual void + on_liveliness_lost ( + ::DDSDataWriter* writer, + const ::DDS_LivelinessLostStatus & status); - virtual void - on_publication_matched ( - ::DDSDataWriter *writer, - const ::DDS_PublicationMatchedStatus & status); + virtual void + on_publication_matched ( + ::DDSDataWriter *writer, + const ::DDS_PublicationMatchedStatus & status); - ::DDS::PublisherListener_ptr get_publisher_listener (void); - private: - ::DDS::PublisherListener_var impl_; - }; - } + ::DDS::PublisherListener_ptr get_publisher_listener (void); + private: + ::DDS::PublisherListener_var impl_; + }; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp index 7546ce89371..b6c2fe40e40 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp @@ -13,119 +13,115 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + CCM_DDS_QueryCondition_i::CCM_DDS_QueryCondition_i () + : impl_ (0) + { + } + + CCM_DDS_QueryCondition_i::~CCM_DDS_QueryCondition_i (void) + { + } + + ::CORBA::Boolean + CCM_DDS_QueryCondition_i::get_trigger_value (void) + { + return this->impl ()->get_trigger_value (); + } + + ::DDS::SampleStateMask + CCM_DDS_QueryCondition_i::get_sample_state_mask (void) + { + return this->impl ()->get_sample_state_mask (); + } + + ::DDS::ViewStateMask + CCM_DDS_QueryCondition_i::get_view_state_mask (void) + { + return this->impl ()->get_view_state_mask (); + } + + ::DDS::InstanceStateMask + CCM_DDS_QueryCondition_i::get_instance_state_mask (void) + { + return this->impl ()->get_instance_state_mask (); + } + + ::DDS::DataReader_ptr + CCM_DDS_QueryCondition_i::get_datareader (void) { - RTI_QueryCondition_i::RTI_QueryCondition_i () - : impl_ (0) - { - } - - RTI_QueryCondition_i::~RTI_QueryCondition_i (void) - { - } - - ::CORBA::Boolean - RTI_QueryCondition_i::get_trigger_value (void) - { - return this->impl ()->get_trigger_value (); - } - - ::DDS::SampleStateMask - RTI_QueryCondition_i::get_sample_state_mask (void) - { - return this->impl ()->get_sample_state_mask (); - } - - ::DDS::ViewStateMask - RTI_QueryCondition_i::get_view_state_mask (void) - { - return this->impl ()->get_view_state_mask (); - } - - ::DDS::InstanceStateMask - RTI_QueryCondition_i::get_instance_state_mask (void) - { - return this->impl ()->get_instance_state_mask (); - } - - ::DDS::DataReader_ptr - RTI_QueryCondition_i::get_datareader (void) - { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW_THROW_EX (dds_reader, - RTI_DataReader_i (), - CORBA::NO_MEMORY ()); - ::DDSDataReader* reader = this->impl ()->get_datareader (); - RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ()); - rti_dr->set_impl (reader); - - return dds_reader._retn (); + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW_THROW_EX (dds_reader, + CCM_DDS_DataReader_i (), + CORBA::NO_MEMORY ()); + ::DDSDataReader* reader = this->impl ()->get_datareader (); + CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ()); + rti_dr->set_impl (reader); + + return dds_reader._retn (); #else - return this->impl ()->get_datareader (); + return this->impl ()->get_datareader (); #endif - } + } - char * - RTI_QueryCondition_i::get_query_expression (void) - { + char * + CCM_DDS_QueryCondition_i::get_query_expression (void) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - return ::CORBA::string_dup (this->impl ()->get_query_expression ()); + return ::CORBA::string_dup (this->impl ()->get_query_expression ()); #else - return this->impl ()->get_query_expression (); + return this->impl ()->get_query_expression (); #endif - } + } - ::DDS::ReturnCode_t - RTI_QueryCondition_i::get_query_parameters ( - ::DDS::StringSeq & query_parameters) - { + ::DDS::ReturnCode_t + CCM_DDS_QueryCondition_i::get_query_parameters ( + ::DDS::StringSeq & query_parameters) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_StringSeq parameters; - ::DDS::ReturnCode_t retval = this->impl ()->get_query_parameters ( - parameters); - query_parameters <<= parameters; - return retval; + DDS_StringSeq parameters; + ::DDS::ReturnCode_t retval = this->impl ()->get_query_parameters ( + parameters); + query_parameters <<= parameters; + return retval; #else - return this->impl ()->get_query_parameters (query_parameters); + return this->impl ()->get_query_parameters (query_parameters); #endif - } + } - ::DDS::ReturnCode_t - RTI_QueryCondition_i::set_query_parameters ( - const ::DDS::StringSeq & query_parameters) - { + ::DDS::ReturnCode_t + CCM_DDS_QueryCondition_i::set_query_parameters ( + const ::DDS::StringSeq & query_parameters) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_StringSeq parameters; - parameters <<= query_parameters; - return this->impl ()->set_query_parameters (parameters); + DDS_StringSeq parameters; + parameters <<= query_parameters; + return this->impl ()->set_query_parameters (parameters); #else - return this->impl ()->set_query_parameters (query_parameters); + return this->impl ()->set_query_parameters (query_parameters); #endif - } - - DDSQueryCondition * - RTI_QueryCondition_i::get_impl (void) - { - return this->impl_; - } - - void - RTI_QueryCondition_i::set_impl (DDSQueryCondition * dw) - { - this->impl_ = dw; - } - - DDSQueryCondition * - RTI_QueryCondition_i::impl (void) - { - if (!this->impl_) - { - throw ::CORBA::BAD_INV_ORDER (); - } - return this->impl_; - } + } + + DDSQueryCondition * + CCM_DDS_QueryCondition_i::get_impl (void) + { + return this->impl_; + } + void + CCM_DDS_QueryCondition_i::set_impl (DDSQueryCondition * dw) + { + this->impl_ = dw; + } + + DDSQueryCondition * + CCM_DDS_QueryCondition_i::impl (void) + { + if (!this->impl_) + { + throw ::CORBA::BAD_INV_ORDER (); + } + return this->impl_; } } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h index 367a68e67a7..7937023b30d 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h @@ -31,55 +31,52 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_QueryCondition_i : + public virtual ::DDS::CCM_QueryCondition, + public virtual ::CORBA::LocalObject { - class DDS4CCM_NDDS_IMPL_Export RTI_QueryCondition_i : - public virtual ::DDS::CCM_QueryCondition, - public virtual ::CORBA::LocalObject - { - public: - // Constructor - RTI_QueryCondition_i (void); + public: + /// Constructor + CCM_DDS_QueryCondition_i (void); - // Destructor - virtual ~RTI_QueryCondition_i (void); + /// Destructor + virtual ~CCM_DDS_QueryCondition_i (void); - virtual ::CORBA::Boolean - get_trigger_value (void); + virtual ::CORBA::Boolean + get_trigger_value (void); - virtual ::DDS::SampleStateMask - get_sample_state_mask (void); + virtual ::DDS::SampleStateMask + get_sample_state_mask (void); - virtual ::DDS::ViewStateMask - get_view_state_mask (void); + virtual ::DDS::ViewStateMask + get_view_state_mask (void); - virtual ::DDS::InstanceStateMask - get_instance_state_mask (void); + virtual ::DDS::InstanceStateMask + get_instance_state_mask (void); - virtual ::DDS::DataReader_ptr - get_datareader (void); + virtual ::DDS::DataReader_ptr + get_datareader (void); - virtual char * - get_query_expression (void); + virtual char * + get_query_expression (void); - virtual ::DDS::ReturnCode_t - get_query_parameters ( - ::DDS::StringSeq & query_parameters); + virtual ::DDS::ReturnCode_t + get_query_parameters ( + ::DDS::StringSeq & query_parameters); - virtual ::DDS::ReturnCode_t - set_query_parameters ( - const ::DDS::StringSeq & query_parameters); + virtual ::DDS::ReturnCode_t + set_query_parameters ( + const ::DDS::StringSeq & query_parameters); - DDSQueryCondition * get_impl (void); + DDSQueryCondition * get_impl (void); - void set_impl (DDSQueryCondition * qc); + void set_impl (DDSQueryCondition * qc); - private: - DDSQueryCondition * impl_; + private: + DDSQueryCondition * impl_; - DDSQueryCondition * impl (); - }; - } + DDSQueryCondition * impl (); + }; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp index e8048898489..c34642dab63 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp @@ -7,77 +7,73 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + CCM_DDS_ReadCondition_i::CCM_DDS_ReadCondition_i (void) + : impl_ (0) { - RTI_ReadCondition_i::RTI_ReadCondition_i (void) - : impl_ (0) - { - } - - RTI_ReadCondition_i::~RTI_ReadCondition_i (void) - { - } + } - ::CORBA::Boolean - RTI_ReadCondition_i::get_trigger_value (void) - { - return this->impl ()->get_trigger_value (); - } + CCM_DDS_ReadCondition_i::~CCM_DDS_ReadCondition_i (void) + { + } - ::DDS::SampleStateMask - RTI_ReadCondition_i::get_sample_state_mask (void) - { - return this->impl ()->get_sample_state_mask (); - } + ::CORBA::Boolean + CCM_DDS_ReadCondition_i::get_trigger_value (void) + { + return this->impl ()->get_trigger_value (); + } - ::DDS::ViewStateMask - RTI_ReadCondition_i::get_view_state_mask (void) - { - return this->impl ()->get_view_state_mask (); - } + ::DDS::SampleStateMask + CCM_DDS_ReadCondition_i::get_sample_state_mask (void) + { + return this->impl ()->get_sample_state_mask (); + } - ::DDS::InstanceStateMask - RTI_ReadCondition_i::get_instance_state_mask (void) - { - return this->impl ()->get_instance_state_mask (); - } + ::DDS::ViewStateMask + CCM_DDS_ReadCondition_i::get_view_state_mask (void) + { + return this->impl ()->get_view_state_mask (); + } - ::DDS::DataReader_ptr - RTI_ReadCondition_i::get_datareader (void) - { - ::DDS::DataReader_var retval = ::DDS::DataReader::_nil (); - ACE_NEW_THROW_EX (retval, - RTI_DataReader_i (), - CORBA::NO_MEMORY ()); - DDSDataReader* rd = this->impl ()->get_datareader (); - RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(retval.in ()); - rti_dr->set_impl (rd); + ::DDS::InstanceStateMask + CCM_DDS_ReadCondition_i::get_instance_state_mask (void) + { + return this->impl ()->get_instance_state_mask (); + } - return retval._retn (); - } + ::DDS::DataReader_ptr + CCM_DDS_ReadCondition_i::get_datareader (void) + { + ::DDS::DataReader_var retval = ::DDS::DataReader::_nil (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DataReader_i (), + CORBA::NO_MEMORY ()); + DDSDataReader* rd = this->impl ()->get_datareader (); + CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(retval.in ()); + rti_dr->set_impl (rd); - DDSReadCondition * - RTI_ReadCondition_i::get_impl (void) - { - return this->impl_; - } + return retval._retn (); + } - void - RTI_ReadCondition_i::set_impl (DDSReadCondition * rc) - { - this->impl_ = rc; - } + DDSReadCondition * + CCM_DDS_ReadCondition_i::get_impl (void) + { + return this->impl_; + } - DDSReadCondition * - RTI_ReadCondition_i::impl (void) - { - if (!this->impl_) - { - throw ::CORBA::BAD_INV_ORDER (); - } - return this->impl_; - } + void + CCM_DDS_ReadCondition_i::set_impl (DDSReadCondition * rc) + { + this->impl_ = rc; + } + DDSReadCondition * + CCM_DDS_ReadCondition_i::impl (void) + { + if (!this->impl_) + { + throw ::CORBA::BAD_INV_ORDER (); + } + return this->impl_; } } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h index b3abe3f70ce..d83633f2ed3 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h @@ -31,44 +31,41 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_ReadCondition_i : + public virtual ::DDS::CCM_ReadCondition, + public virtual ::CORBA::LocalObject { - class DDS4CCM_NDDS_IMPL_Export RTI_ReadCondition_i : - public virtual ::DDS::CCM_ReadCondition, - public virtual ::CORBA::LocalObject - { - public: - // Constructor - RTI_ReadCondition_i (void); + public: + /// Constructor + CCM_DDS_ReadCondition_i (void); - // Destructor - virtual ~RTI_ReadCondition_i (void); + /// Destructor + virtual ~CCM_DDS_ReadCondition_i (void); - virtual ::CORBA::Boolean - get_trigger_value (void); + virtual ::CORBA::Boolean + get_trigger_value (void); - virtual ::DDS::SampleStateMask - get_sample_state_mask (void); + virtual ::DDS::SampleStateMask + get_sample_state_mask (void); - virtual ::DDS::ViewStateMask - get_view_state_mask (void); + virtual ::DDS::ViewStateMask + get_view_state_mask (void); - virtual ::DDS::InstanceStateMask - get_instance_state_mask (void); + virtual ::DDS::InstanceStateMask + get_instance_state_mask (void); - virtual ::DDS::DataReader_ptr - get_datareader (void); + virtual ::DDS::DataReader_ptr + get_datareader (void); - DDSReadCondition * get_impl (void); + DDSReadCondition * get_impl (void); - void set_impl (DDSReadCondition * rc); + void set_impl (DDSReadCondition * rc); - private: - DDSReadCondition *impl_; + private: + DDSReadCondition *impl_; - DDSReadCondition * impl (void); - }; - } + DDSReadCondition * impl (void); + }; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.cpp index 809c5f30bcd..b69f25cae52 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.cpp @@ -513,7 +513,7 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::set_impl ( else { this->reader_ = reader; - RTI_DataReader_i *rdr = dynamic_cast <RTI_DataReader_i *> (reader); + CCM_DDS_DataReader_i *rdr = dynamic_cast <CCM_DDS_DataReader_i *> (reader); if (!rdr) { diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp index db78c8299a9..928c314cddb 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp @@ -18,458 +18,460 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + CCM_DDS_Subscriber_i::CCM_DDS_Subscriber_i (DDSSubscriber * sub) + : impl_ (sub) { - RTI_Subscriber_i::RTI_Subscriber_i (void) - : impl_ (0) - { - DDS4CCM_TRACE ("RTI_Subscriber_i::RTI_Subscriber_i"); - } - - RTI_Subscriber_i::~RTI_Subscriber_i (void) - { - DDS4CCM_TRACE ("RTI_Subscriber_i::~RTI_Subscriber_i"); - } - - ::DDS::ReturnCode_t - RTI_Subscriber_i::enable (void) - { - return this->impl ()->enable (); - } - - ::DDS::StatusCondition_ptr - RTI_Subscriber_i::get_statuscondition (void) - { - ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); + DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::CCM_DDS_Subscriber_i"); + } + + CCM_DDS_Subscriber_i::~CCM_DDS_Subscriber_i (void) + { + DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::~CCM_DDS_Subscriber_i"); + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::enable (void) + { + return this->impl ()->enable (); + } + + ::DDS::StatusCondition_ptr + CCM_DDS_Subscriber_i::get_statuscondition (void) + { + ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSStatusCondition* sc = this->impl ()->get_statuscondition (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc), - CORBA::NO_MEMORY ()); + DDSStatusCondition* sc = this->impl ()->get_statuscondition (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc), + CORBA::NO_MEMORY ()); #else - ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc.in ()), - CORBA::NO_MEMORY ()); + ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc.in ()), + CORBA::NO_MEMORY ()); #endif - return retval._retn (); - } - - ::DDS::StatusMask - RTI_Subscriber_i::get_status_changes (void) - { - return this->impl ()->get_status_changes (); - } - - ::DDS::InstanceHandle_t - RTI_Subscriber_i::get_instance_handle (void) - { + return retval._retn (); + } + + ::DDS::StatusMask + CCM_DDS_Subscriber_i::get_status_changes (void) + { + return this->impl ()->get_status_changes (); + } + + ::DDS::InstanceHandle_t + CCM_DDS_Subscriber_i::get_instance_handle (void) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); - ::DDS::InstanceHandle_t handle; - handle <<= rtihandle; - return handle; + ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); + ::DDS::InstanceHandle_t handle; + handle <<= rtihandle; + return handle; #else - return this->impl ()->get_instance_handle (); + return this->impl ()->get_instance_handle (); #endif - } - - DDSDataReader * - RTI_Subscriber_i::create_datareader ( - DDSContentFilteredTopic * topic, - DDSDataReaderListener * rti_drl, - ::DDS::StatusMask mask) - { + } + + DDSDataReader * + CCM_DDS_Subscriber_i::create_datareader ( + DDSContentFilteredTopic * topic, + DDSDataReaderListener * rti_drl, + ::DDS::StatusMask mask) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_DataReaderQos rti_qos = DDS_DATAREADER_QOS_DEFAULT; + DDS_DataReaderQos rti_qos = DDS_DATAREADER_QOS_DEFAULT; #else - ::DDS::DataReaderQos rti_qos; + ::DDS::DataReaderQos rti_qos; #endif - return this->impl ()->create_datareader (topic, - rti_qos, - rti_drl, - mask); - } - - DDSDataReader * - RTI_Subscriber_i::create_datareader ( - DDSTopic * topic, - DDSDataReaderListener * rti_drl, - ::DDS::StatusMask mask) - { + return this->impl ()->create_datareader (topic, + rti_qos, + rti_drl, + mask); + } + + DDSDataReader * + CCM_DDS_Subscriber_i::create_datareader ( + DDSTopic * topic, + DDSDataReaderListener * rti_drl, + ::DDS::StatusMask mask) + { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_DataReaderQos rti_qos = DDS_DATAREADER_QOS_DEFAULT; + DDS_DataReaderQos rti_qos = DDS_DATAREADER_QOS_DEFAULT; #else - DDS::DataReaderQos rti_qos; + DDS::DataReaderQos rti_qos; #endif - return this->impl ()->create_datareader (topic, - rti_qos, - rti_drl, - mask); - } + return this->impl ()->create_datareader (topic, + rti_qos, + rti_drl, + mask); + } #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSDataReader * - RTI_Subscriber_i::create_datareader_with_profile ( - DDSContentFilteredTopic * topic, - const char * library_name, - const char * profile_name, - DDSDataReaderListener * rti_drl, - ::DDS::StatusMask mask) - { - return this->impl ()->create_datareader_with_profile (topic, - library_name, - profile_name, - rti_drl, - mask); - } + DDSDataReader * + CCM_DDS_Subscriber_i::create_datareader_with_profile ( + DDSContentFilteredTopic * topic, + const char * library_name, + const char * profile_name, + DDSDataReaderListener * rti_drl, + ::DDS::StatusMask mask) + { + return this->impl ()->create_datareader_with_profile (topic, + library_name, + profile_name, + rti_drl, + mask); + } #endif #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSDataReader * - RTI_Subscriber_i::create_datareader_with_profile ( - DDSTopic * topic, - const char * library_name, - const char * profile_name, - DDSDataReaderListener * rti_drl, - ::DDS::StatusMask mask) - { - return this->impl ()->create_datareader_with_profile (topic, - library_name, - profile_name, - rti_drl, - mask); - } + DDSDataReader * + CCM_DDS_Subscriber_i::create_datareader_with_profile ( + DDSTopic * topic, + const char * library_name, + const char * profile_name, + DDSDataReaderListener * rti_drl, + ::DDS::StatusMask mask) + { + return this->impl ()->create_datareader_with_profile (topic, + library_name, + profile_name, + rti_drl, + mask); + } #endif - ::DDS::DataReader_ptr - RTI_Subscriber_i::create_datareader ( - ::DDS::TopicDescription_ptr a_topic, - const ::DDS::DataReaderQos & /*qos*/, - ::DDS::DataReaderListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("RTI_Subscriber_i::create_datareader"); - ::DDS::DataReader_var retval = ::DDS::DataReader::_nil (); - ACE_NEW_THROW_EX (retval, - RTI_DataReader_i (), - CORBA::NO_MEMORY ()); - - DDSDataReaderListener *rti_drl = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (rti_drl, - RTI_DataReaderListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - - DDSDataReader * rti_dr = 0; - CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic); - - if (!topic) - { - RTI_ContentFilteredTopic_i * cf_topic = - dynamic_cast < RTI_ContentFilteredTopic_i * > (a_topic); - if (!cf_topic) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_Subscriber_i::create_datareader - " - "Error: Unable to cast provided topic to one of its servant.\n")); - delete rti_drl; - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); - } - else - rti_dr = this->create_datareader (cf_topic->get_impl (), rti_drl, mask); - } - else - rti_dr = this->create_datareader (topic->get_impl (), rti_drl, mask); - - if (!rti_dr) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_Subscriber_i::create_datareader - " - "Error: RTI Topic returned a nil datareader.\n")); - delete rti_drl; - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - else - { - DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "RTI_Subscriber_i::create_datareader_with_profile - " - "Successfully created datareader.\n")); - } - - rti_dr->enable (); - RTI_DataReader_i *dr = dynamic_cast < RTI_DataReader_i *>(retval.in ()); - dr->set_impl (rti_dr); - - return retval._retn (); - } - - ::DDS::DataReader_ptr - RTI_Subscriber_i::create_datareader_with_profile ( - ::DDS::TopicDescription_ptr a_topic, - const char * library_name, - const char * profile_name, - ::DDS::DataReaderListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("RTI_Subscriber_i::create_datareader_with_profile"); - ::DDS::DataReader_var retval = ::DDS::DataReader::_nil (); - ACE_NEW_THROW_EX (retval, - RTI_DataReader_i (), - CORBA::NO_MEMORY ()); - - DDSDataReaderListener *rti_drl = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (rti_drl, - RTI_DataReaderListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - - DDSDataReader * rti_dr = 0; - CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic); - - if (!topic) - { - RTI_ContentFilteredTopic_i * cf_topic = - dynamic_cast < RTI_ContentFilteredTopic_i * > (a_topic); - if (!cf_topic) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_Subscriber_i::create_datareader_with_profile - " - "Error: Unable to cast provided topic to one of its servant.\n")); - delete rti_drl; - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); - } - else - rti_dr = this->create_datareader_with_profile (cf_topic->get_impl (), - library_name, - profile_name, - rti_drl, - mask); - } - else - rti_dr = this->create_datareader_with_profile (topic->get_impl (), - library_name, - profile_name, - rti_drl, - mask); - - if (!rti_dr) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_Subscriber_i::create_datareader_with_profile - " - "Error: RTI Topic returned a nil datareader.\n")); - delete rti_drl; - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - else - { - DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "RTI_Subscriber_i::create_datareader_with_profile - " - "Successfully created datareader with profile <%C#%C>.\n", - library_name, - profile_name)); - } - - rti_dr->enable (); - RTI_DataReader_i *dr = dynamic_cast < RTI_DataReader_i *>(retval.in ()); - dr->set_impl (rti_dr); - - return retval._retn (); - } - - ::DDS::ReturnCode_t - RTI_Subscriber_i::delete_datareader ( - ::DDS::DataReader_ptr a_datareader) - { - RTI_DataReader_i *dr = dynamic_cast< RTI_DataReader_i *> (a_datareader); - if (!dr) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_Subscriber_i::delete_datareader - " - "Unable to cast provided object reference to servant.\n")); - return ::DDS::RETCODE_BAD_PARAMETER; - } - - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "RTI_Subscriber_i::delete_datareader - " - "Successfully casted provided object reference to servant.\n")); - - DDS_ReturnCode_t const retval = this->impl ()->delete_datareader (dr->get_impl ()); - - if (retval != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_Subscriber_i::delete_datareader - " - "Error: Returned non-ok error code %C\n", - translate_retcode (retval))); - } - else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "RTI_Subscriber_i::delete_datareader - " - "Datareader successfully deleted\n")); - - return retval; - } - - ::DDS::ReturnCode_t - RTI_Subscriber_i::delete_contained_entities (void) - { - return this->impl ()->delete_contained_entities (); - } - - ::DDS::DataReader_ptr - RTI_Subscriber_i::lookup_datareader ( - const char * impl_name) - { - ::DDS::DataReader_var retval = ::DDS::DataReader::_nil (); - ACE_NEW_THROW_EX (retval, - RTI_DataReader_i (), - CORBA::NO_MEMORY ()); - DDSDataReader* dr = this->impl ()->lookup_datareader (impl_name); - RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(retval.in ()); - rti_dr->set_impl (dr); - return retval._retn (); - } - - ::DDS::ReturnCode_t - RTI_Subscriber_i::get_datareaders ( - ::DDS::DataReaderSeq & /*readers*/, - ::DDS::SampleStateMask /*sample_states*/, - ::DDS::ViewStateMask /*view_states*/, - ::DDS::InstanceStateMask /*instance_states*/) - { - throw CORBA::NO_IMPLEMENT (); - // Add your implementation here - } - - ::DDS::ReturnCode_t - RTI_Subscriber_i::notify_datareaders (void) - { - return this->impl ()->notify_datareaders (); - } - - ::DDS::ReturnCode_t - RTI_Subscriber_i::set_qos ( - const ::DDS::SubscriberQos & /*qos*/) - { - DDS_SubscriberQos rti_impl_qos; + ::DDS::DataReader_ptr + CCM_DDS_Subscriber_i::create_datareader ( + ::DDS::TopicDescription_ptr a_topic, + const ::DDS::DataReaderQos & /*qos*/, + ::DDS::DataReaderListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::create_datareader"); + ::DDS::DataReader_var retval = ::DDS::DataReader::_nil (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DataReader_i (), + CORBA::NO_MEMORY ()); + + DDSDataReaderListener *rti_drl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_drl, + CCM_DDS_DataReaderListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + + DDSDataReader * rti_dr = 0; + CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic); + + if (!topic) + { + CCM_DDS_ContentFilteredTopic_i * cf_topic = + dynamic_cast < CCM_DDS_ContentFilteredTopic_i * > (a_topic); + if (!cf_topic) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_i::create_datareader - " + "Error: Unable to cast provided topic to one of its servant.\n")); + delete rti_drl; + throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); + } + else + rti_dr = this->create_datareader (cf_topic->get_impl (), rti_drl, mask); + } + else + rti_dr = this->create_datareader (topic->get_impl (), rti_drl, mask); + + if (!rti_dr) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_i::create_datareader - " + "Error: RTI Topic returned a nil datareader.\n")); + delete rti_drl; + throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + } + else + { + DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "CCM_DDS_Subscriber_i::create_datareader_with_profile - " + "Successfully created datareader.\n")); + } + + rti_dr->enable (); + CCM_DDS_DataReader_i *dr = dynamic_cast < CCM_DDS_DataReader_i *>(retval.in ()); + dr->set_impl (rti_dr); + + return retval._retn (); + } + + ::DDS::DataReader_ptr + CCM_DDS_Subscriber_i::create_datareader_with_profile ( + ::DDS::TopicDescription_ptr a_topic, + const char * library_name, + const char * profile_name, + ::DDS::DataReaderListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::create_datareader_with_profile"); + ::DDS::DataReader_var retval = ::DDS::DataReader::_nil (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DataReader_i (), + CORBA::NO_MEMORY ()); + + DDSDataReaderListener *rti_drl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_drl, + CCM_DDS_DataReaderListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + + DDSDataReader * rti_dr = 0; + CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic); + + if (!topic) + { + CCM_DDS_ContentFilteredTopic_i * cf_topic = + dynamic_cast < CCM_DDS_ContentFilteredTopic_i * > (a_topic); + if (!cf_topic) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_i::create_datareader_with_profile - " + "Error: Unable to cast provided topic to one of its servant.\n")); + delete rti_drl; + throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); + } + else + rti_dr = this->create_datareader_with_profile (cf_topic->get_impl (), + library_name, + profile_name, + rti_drl, + mask); + } + else + rti_dr = this->create_datareader_with_profile (topic->get_impl (), + library_name, + profile_name, + rti_drl, + mask); + + if (!rti_dr) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_i::create_datareader_with_profile - " + "Error: RTI Topic returned a nil datareader.\n")); + delete rti_drl; + throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + } + else + { + DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "CCM_DDS_Subscriber_i::create_datareader_with_profile - " + "Successfully created datareader with profile <%C#%C>.\n", + library_name, + profile_name)); + } + + rti_dr->enable (); + CCM_DDS_DataReader_i *dr = dynamic_cast < CCM_DDS_DataReader_i *>(retval.in ()); + dr->set_impl (rti_dr); + + return retval._retn (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::delete_datareader ( + ::DDS::DataReader_ptr a_datareader) + { + CCM_DDS_DataReader_i *dr = dynamic_cast< CCM_DDS_DataReader_i *> (a_datareader); + if (!dr) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_i::delete_datareader - " + "Unable to cast provided object reference to servant.\n")); + return ::DDS::RETCODE_BAD_PARAMETER; + } + + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_Subscriber_i::delete_datareader - " + "Successfully casted provided object reference to servant.\n")); + + DDS_ReturnCode_t const retval = this->impl ()->delete_datareader (dr->get_impl ()); + + if (retval != DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_i::delete_datareader - " + "Error: Returned non-ok error code %C\n", + translate_retcode (retval))); + } + else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_Subscriber_i::delete_datareader - " + "Datareader successfully deleted\n")); + + return retval; + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::delete_contained_entities (void) + { + return this->impl ()->delete_contained_entities (); + } + + ::DDS::DataReader_ptr + CCM_DDS_Subscriber_i::lookup_datareader ( + const char * impl_name) + { + ::DDS::DataReader_var retval = ::DDS::DataReader::_nil (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DataReader_i (), + CORBA::NO_MEMORY ()); + DDSDataReader* dr = this->impl ()->lookup_datareader (impl_name); + CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(retval.in ()); + rti_dr->set_impl (dr); + return retval._retn (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::get_datareaders ( + ::DDS::DataReaderSeq & /*readers*/, + ::DDS::SampleStateMask /*sample_states*/, + ::DDS::ViewStateMask /*view_states*/, + ::DDS::InstanceStateMask /*instance_states*/) + { + throw CORBA::NO_IMPLEMENT (); + // Add your implementation here + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::notify_datareaders (void) + { + return this->impl ()->notify_datareaders (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::set_qos ( + const ::DDS::SubscriberQos & /*qos*/) + { + DDS_SubscriberQos rti_impl_qos; /* rti_impl_qos.presentation = qos.presentation; - rti_impl_qos.partition = qos.partition; - rti_impl_qos.group_data = qos.group_data; - rti_impl_qos.entity_factory = qos.entity_factory;*/ - return this->impl ()->set_qos (rti_impl_qos); - } - - ::DDS::ReturnCode_t - RTI_Subscriber_i::get_qos ( - ::DDS::SubscriberQos & /*qos*/) - { - DDS_SubscriberQos rti_impl_qos; - ::DDS::ReturnCode_t const rti_retcode = this->impl ()->get_qos (rti_impl_qos); - /*qos.presentation = rti_impl_qos.presentation; - qos.partition = rti_impl_qos.partition; - qos.group_data = rti_impl_qos.group_data; - qos.entity_factory = rti_impl_qos.entity_factory;*/ - return rti_retcode; - } - - ::DDS::ReturnCode_t - RTI_Subscriber_i::set_listener ( - ::DDS::SubscriberListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("RTI_Subscriber_i::set_listener"); - - RTI_SubscriberListener_i* rti_impl_list = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (rti_impl_list, - RTI_SubscriberListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - return this->impl ()->set_listener (rti_impl_list, mask); - } - - ::DDS::SubscriberListener_ptr - RTI_Subscriber_i::get_listener (void) - { - DDS4CCM_TRACE ("RTI_Subscriber_i::get_listener"); - - DDSSubscriberListener *rti_impl_list = this->impl ()->get_listener (); - RTI_SubscriberListener_i *list_proxy = dynamic_cast <RTI_SubscriberListener_i *> (rti_impl_list); - if (!list_proxy) - { - DDS4CCM_DEBUG (6, (LM_DEBUG, "RTI_Subscriber_i::get_listener - " - "DDS returned a NIL listener.\n")); - return ::DDS::SubscriberListener::_nil (); - } - return list_proxy->get_subscriber_listener (); - } - - ::DDS::ReturnCode_t - RTI_Subscriber_i::begin_access (void) - { - return this->impl ()->begin_access (); - } - - ::DDS::ReturnCode_t - RTI_Subscriber_i::end_access (void) - { - return this->impl ()->end_access (); - } - - ::DDS::DomainParticipant_ptr - RTI_Subscriber_i::get_participant (void) - { - ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); - ACE_NEW_THROW_EX (retval, - RTI_DomainParticipant_i (), - CORBA::NO_MEMORY ()); - DDSDomainParticipant* p = this->impl ()->get_participant (); - RTI_DomainParticipant_i *rti_dp = dynamic_cast < RTI_DomainParticipant_i *> (retval.in ()); - rti_dp->set_impl (p); - return retval._retn (); - } - - ::DDS::ReturnCode_t - RTI_Subscriber_i::set_default_datareader_qos ( - const ::DDS::DataReaderQos & /*qos*/) - { - throw CORBA::NO_IMPLEMENT (); - // Add your implementation here - } - - ::DDS::ReturnCode_t - RTI_Subscriber_i::get_default_datareader_qos ( - ::DDS::DataReaderQos & /*qos*/) - { - throw CORBA::NO_IMPLEMENT (); - // Add your implementation here - } - - ::DDS::ReturnCode_t - RTI_Subscriber_i::copy_from_topic_qos ( - ::DDS::DataReaderQos & /*a_datareader_qos*/, - const ::DDS::TopicQos & /*a_impl_qos*/) - { - throw CORBA::NO_IMPLEMENT (); - // Add your implementation here - } - - DDSSubscriber * - RTI_Subscriber_i::get_impl (void) - { - return this->impl_; - } - - void - RTI_Subscriber_i::set_impl (DDSSubscriber * sub) - { - this->impl_ = sub; - } - - DDSSubscriber * - RTI_Subscriber_i::impl (void) - { - if (!this->impl_) - { - throw ::CORBA::BAD_INV_ORDER (); - } - return this->impl_; - } + rti_impl_qos.partition = qos.partition; + rti_impl_qos.group_data = qos.group_data; + rti_impl_qos.entity_factory = qos.entity_factory;*/ + return this->impl ()->set_qos (rti_impl_qos); + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::get_qos ( + ::DDS::SubscriberQos & /*qos*/) + { + DDS_SubscriberQos rti_impl_qos; + ::DDS::ReturnCode_t const rti_retcode = this->impl ()->get_qos (rti_impl_qos); + /*qos.presentation = rti_impl_qos.presentation; + qos.partition = rti_impl_qos.partition; + qos.group_data = rti_impl_qos.group_data; + qos.entity_factory = rti_impl_qos.entity_factory;*/ + return rti_retcode; + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::set_listener ( + ::DDS::SubscriberListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::set_listener"); + + CCM_DDS_SubscriberListener_i* rti_impl_list = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_impl_list, + CCM_DDS_SubscriberListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + return this->impl ()->set_listener (rti_impl_list, mask); + } + + ::DDS::SubscriberListener_ptr + CCM_DDS_Subscriber_i::get_listener (void) + { + DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::get_listener"); + + DDSSubscriberListener *rti_impl_list = this->impl ()->get_listener (); + CCM_DDS_SubscriberListener_i *list_proxy = dynamic_cast <CCM_DDS_SubscriberListener_i *> (rti_impl_list); + if (!list_proxy) + { + DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_Subscriber_i::get_listener - " + "DDS returned a NIL listener.\n")); + return ::DDS::SubscriberListener::_nil (); + } + return list_proxy->get_subscriber_listener (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::begin_access (void) + { + return this->impl ()->begin_access (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::end_access (void) + { + return this->impl ()->end_access (); + } + + ::DDS::DomainParticipant_ptr + CCM_DDS_Subscriber_i::get_participant (void) + { + ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSDomainParticipant* p = this->impl ()->get_participant (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (p), + CORBA::NO_MEMORY ()); +#else + ::DDS::DomainParticipant_var p = this->impl ()->get_participant (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (p.in ()), + CORBA::NO_MEMORY ()); +#endif + return retval._retn (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::set_default_datareader_qos ( + const ::DDS::DataReaderQos & /*qos*/) + { + throw CORBA::NO_IMPLEMENT (); + // Add your implementation here + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::get_default_datareader_qos ( + ::DDS::DataReaderQos & /*qos*/) + { + throw CORBA::NO_IMPLEMENT (); + // Add your implementation here + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::copy_from_topic_qos ( + ::DDS::DataReaderQos & /*a_datareader_qos*/, + const ::DDS::TopicQos & /*a_impl_qos*/) + { + throw CORBA::NO_IMPLEMENT (); + // Add your implementation here + } + + DDSSubscriber * + CCM_DDS_Subscriber_i::get_impl (void) + { + return this->impl_; + } + + void + CCM_DDS_Subscriber_i::set_impl (DDSSubscriber * sub) + { + this->impl_ = sub; + } + + DDSSubscriber * + CCM_DDS_Subscriber_i::impl (void) + { + if (!this->impl_) + { + throw ::CORBA::BAD_INV_ORDER (); + } + return this->impl_; } } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h index efc943e5b33..12e59f178ed 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h @@ -35,149 +35,139 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_Subscriber_i : + public virtual ::DDS::CCM_Subscriber, + public virtual ::CORBA::LocalObject { - class DDS4CCM_NDDS_IMPL_Export RTI_Subscriber_i : - public virtual ::DDS::CCM_Subscriber, - public virtual ::CORBA::LocalObject - { - public: - // Constructor - RTI_Subscriber_i (void); + public: + /// Constructor + CCM_DDS_Subscriber_i (DDSSubscriber * sub); - // Destructor - virtual ~RTI_Subscriber_i (void); + /// Destructor + virtual ~CCM_DDS_Subscriber_i (void); - virtual ::DDS::ReturnCode_t - enable (void); + virtual ::DDS::ReturnCode_t enable (void); - virtual ::DDS::StatusCondition_ptr - get_statuscondition (void); + virtual ::DDS::StatusCondition_ptr get_statuscondition (void); - virtual ::DDS::StatusMask - get_status_changes (void); + virtual ::DDS::StatusMask get_status_changes (void); - virtual ::DDS::InstanceHandle_t - get_instance_handle (void); + virtual ::DDS::InstanceHandle_t get_instance_handle (void); - virtual ::DDS::DataReader_ptr - create_datareader ( - ::DDS::TopicDescription_ptr a_topic, - const ::DDS::DataReaderQos & qos, - ::DDS::DataReaderListener_ptr a_listener, - ::DDS::StatusMask mask); + virtual ::DDS::DataReader_ptr create_datareader ( + ::DDS::TopicDescription_ptr a_topic, + const ::DDS::DataReaderQos & qos, + ::DDS::DataReaderListener_ptr a_listener, + ::DDS::StatusMask mask); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - virtual ::DDS::DataReader_ptr - create_datareader_with_profile ( - ::DDS::TopicDescription_ptr a_topic, - const char* library_name, - const char *profile_name, - ::DDS::DataReaderListener_ptr a_listener, - ::DDS::StatusMask mask); + virtual ::DDS::DataReader_ptr + create_datareader_with_profile ( + ::DDS::TopicDescription_ptr a_topic, + const char* library_name, + const char *profile_name, + ::DDS::DataReaderListener_ptr a_listener, + ::DDS::StatusMask mask); #endif - virtual ::DDS::ReturnCode_t - delete_datareader ( - ::DDS::DataReader_ptr a_datareader); + virtual ::DDS::ReturnCode_t + delete_datareader ( + ::DDS::DataReader_ptr a_datareader); - virtual ::DDS::ReturnCode_t - delete_contained_entities (void); + virtual ::DDS::ReturnCode_t delete_contained_entities (void); - virtual ::DDS::DataReader_ptr - lookup_datareader ( - const char * impl_name); + virtual ::DDS::DataReader_ptr lookup_datareader ( + const char * impl_name); - virtual ::DDS::ReturnCode_t - get_datareaders ( - ::DDS::DataReaderSeq & readers, - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states); + virtual ::DDS::ReturnCode_t + get_datareaders ( + ::DDS::DataReaderSeq & readers, + ::DDS::SampleStateMask sample_states, + ::DDS::ViewStateMask view_states, + ::DDS::InstanceStateMask instance_states); - virtual ::DDS::ReturnCode_t - notify_datareaders (void); + virtual ::DDS::ReturnCode_t + notify_datareaders (void); - virtual ::DDS::ReturnCode_t - set_qos ( - const ::DDS::SubscriberQos & qos); + virtual ::DDS::ReturnCode_t + set_qos ( + const ::DDS::SubscriberQos & qos); - virtual ::DDS::ReturnCode_t - get_qos ( - ::DDS::SubscriberQos & qos); + virtual ::DDS::ReturnCode_t + get_qos ( + ::DDS::SubscriberQos & qos); - virtual ::DDS::ReturnCode_t - set_listener ( - ::DDS::SubscriberListener_ptr a_listener, - ::DDS::StatusMask mask); + virtual ::DDS::ReturnCode_t + set_listener ( + ::DDS::SubscriberListener_ptr a_listener, + ::DDS::StatusMask mask); - virtual ::DDS::SubscriberListener_ptr - get_listener (void); + virtual ::DDS::SubscriberListener_ptr + get_listener (void); - virtual ::DDS::ReturnCode_t - begin_access (void); + virtual ::DDS::ReturnCode_t + begin_access (void); - virtual ::DDS::ReturnCode_t - end_access (void); + virtual ::DDS::ReturnCode_t + end_access (void); - virtual ::DDS::DomainParticipant_ptr - get_participant (void); + virtual ::DDS::DomainParticipant_ptr + get_participant (void); - virtual ::DDS::ReturnCode_t - set_default_datareader_qos ( - const ::DDS::DataReaderQos & qos); + virtual ::DDS::ReturnCode_t + set_default_datareader_qos ( + const ::DDS::DataReaderQos & qos); - virtual ::DDS::ReturnCode_t - get_default_datareader_qos ( - ::DDS::DataReaderQos & qos); + virtual ::DDS::ReturnCode_t + get_default_datareader_qos ( + ::DDS::DataReaderQos & qos); - virtual ::DDS::ReturnCode_t - copy_from_topic_qos ( - ::DDS::DataReaderQos & a_datareader_qos, - const ::DDS::TopicQos & a_impl_qos); + virtual ::DDS::ReturnCode_t + copy_from_topic_qos ( + ::DDS::DataReaderQos & a_datareader_qos, + const ::DDS::TopicQos & a_impl_qos); - DDSSubscriber * get_impl (void); + DDSSubscriber * get_impl (void); - void set_impl (DDSSubscriber * sub); + void set_impl (DDSSubscriber * sub); - private: - DDSSubscriber *impl_; + private: + DDSSubscriber *impl_; - DDSSubscriber *impl (void); + DDSSubscriber *impl (void); - DDSDataReader * - create_datareader ( - DDSTopic * topic, - DDSDataReaderListener * rti_drl, - ::DDS::StatusMask mask); + DDSDataReader * + create_datareader ( + DDSTopic * topic, + DDSDataReaderListener * rti_drl, + ::DDS::StatusMask mask); - DDSDataReader * - create_datareader ( - DDSContentFilteredTopic * topic, - DDSDataReaderListener * rti_drl, - ::DDS::StatusMask mask); + DDSDataReader * + create_datareader ( + DDSContentFilteredTopic * topic, + DDSDataReaderListener * rti_drl, + ::DDS::StatusMask mask); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSDataReader * - create_datareader_with_profile ( - DDSContentFilteredTopic * topic, - const char* library_name, - const char *profile_name, - DDSDataReaderListener * rti_drl, - ::DDS::StatusMask mask); + DDSDataReader * + create_datareader_with_profile ( + DDSContentFilteredTopic * topic, + const char* library_name, + const char *profile_name, + DDSDataReaderListener * rti_drl, + ::DDS::StatusMask mask); #endif #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSDataReader * - create_datareader_with_profile ( - DDSTopic * topic, - const char* library_name, - const char *profile_name, - DDSDataReaderListener * rti_drl, - ::DDS::StatusMask mask); -#endif - }; - } + DDSDataReader * + create_datareader_with_profile ( + DDSTopic * topic, + const char* library_name, + const char *profile_name, + DDSDataReaderListener * rti_drl, + ::DDS::StatusMask mask); +#endif + }; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp index 1f5133fd3ba..0328e563935 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp @@ -15,179 +15,171 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + CCM_DDS_SubscriberListener_i::CCM_DDS_SubscriberListener_i (::DDS::SubscriberListener_ptr p) + : impl_ ( ::DDS::SubscriberListener::_duplicate (p)) { - RTI_SubscriberListener_i::RTI_SubscriberListener_i (::DDS::SubscriberListener_ptr p) - : impl_ ( ::DDS::SubscriberListener::_duplicate (p)) - { - DDS4CCM_TRACE ("RTI_SubscriberListener_i::RTI_SubscriberListener_i"); - } - - RTI_SubscriberListener_i::~RTI_SubscriberListener_i (void) - { - DDS4CCM_TRACE ("RTI_SubscriberListener_i::~RTI_SubscriberListener_i"); - } - - void - RTI_SubscriberListener_i::on_data_on_readers ( - ::DDSSubscriber* the_subscriber) - { - DDS4CCM_TRACE ("RTI_SubscriberListener_i::on_data_on_readers"); + DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::CCM_DDS_SubscriberListener_i"); + } -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::Subscriber_var sub = ::DDS::Subscriber::_nil (); - ACE_NEW (sub, RTI_Subscriber_i ()); - RTI_Subscriber_i *s = dynamic_cast < RTI_Subscriber_i *> (sub.in ()); - s->set_impl (the_subscriber); - this->impl_->on_data_on_readers (sub.in ()); -#else - this->impl_->on_data_on_readers (the_subscriber); -#endif - the_subscriber->notify_datareaders (); - } + CCM_DDS_SubscriberListener_i::~CCM_DDS_SubscriberListener_i (void) + { + DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::~CCM_DDS_SubscriberListener_i"); + } - void - RTI_SubscriberListener_i::on_requested_deadline_missed ( - ::DDSDataReader* the_reader, - const ::DDS_RequestedDeadlineMissedStatus & status) - { - DDS4CCM_TRACE ("RTI_SubscriberListener_i::on_requested_deadline_missed"); + void + CCM_DDS_SubscriberListener_i::on_data_on_readers ( + ::DDSSubscriber* the_subscriber) + { + DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_data_on_readers"); + + ::DDS::Subscriber_var sub = ::DDS::Subscriber::_nil (); + ACE_NEW (sub, + CCM_DDS_Subscriber_i (the_subscriber)); + this->impl_->on_data_on_readers (sub.in ()); + the_subscriber->notify_datareaders (); + } + + void + CCM_DDS_SubscriberListener_i::on_requested_deadline_missed ( + ::DDSDataReader* the_reader, + const ::DDS_RequestedDeadlineMissedStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_requested_deadline_missed"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::RequestedDeadlineMissedStatus ddsstatus; - ddsstatus <<= status; - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, RTI_DataReader_i ()); - RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ()); - rti_dr->set_impl (the_reader); - this->impl_->on_requested_deadline_missed (dds_reader.in (), ddsstatus); + ::DDS::RequestedDeadlineMissedStatus ddsstatus; + ddsstatus <<= status; + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, CCM_DDS_DataReader_i ()); + CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ()); + rti_dr->set_impl (the_reader); + this->impl_->on_requested_deadline_missed (dds_reader.in (), ddsstatus); #else - this->impl_->on_requested_deadline_missed (the_reader, status); + this->impl_->on_requested_deadline_missed (the_reader, status); #endif - } + } - void - RTI_SubscriberListener_i::on_requested_incompatible_qos ( - ::DDSDataReader* the_reader, - const ::DDS_RequestedIncompatibleQosStatus & status) - { - DDS4CCM_TRACE ("RTI_SubscriberListener_i::on_requested_incompatible_qos"); + void + CCM_DDS_SubscriberListener_i::on_requested_incompatible_qos ( + ::DDSDataReader* the_reader, + const ::DDS_RequestedIncompatibleQosStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_requested_incompatible_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::RequestedIncompatibleQosStatus ddsstatus; - ddsstatus <<= status; - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, RTI_DataReader_i ()); - RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ()); - rti_dr->set_impl (the_reader); - this->impl_->on_requested_incompatible_qos (dds_reader.in (), ddsstatus); + ::DDS::RequestedIncompatibleQosStatus ddsstatus; + ddsstatus <<= status; + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, CCM_DDS_DataReader_i ()); + CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ()); + rti_dr->set_impl (the_reader); + this->impl_->on_requested_incompatible_qos (dds_reader.in (), ddsstatus); #else - this->impl_->on_requested_incompatible_qos (the_reader, status); + this->impl_->on_requested_incompatible_qos (the_reader, status); #endif - } + } - void - RTI_SubscriberListener_i::on_sample_rejected ( - ::DDSDataReader* the_reader, - const ::DDS_SampleRejectedStatus & status) - { - DDS4CCM_TRACE ("RTI_SubscriberListener_i::on_sample_rejected"); + void + CCM_DDS_SubscriberListener_i::on_sample_rejected ( + ::DDSDataReader* the_reader, + const ::DDS_SampleRejectedStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_sample_rejected"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::SampleRejectedStatus ddsstatus; - ddsstatus <<= status; - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, RTI_DataReader_i ()); - RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ()); - rti_dr->set_impl (the_reader); - this->impl_->on_sample_rejected (dds_reader.in (), ddsstatus); + ::DDS::SampleRejectedStatus ddsstatus; + ddsstatus <<= status; + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, CCM_DDS_DataReader_i ()); + CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ()); + rti_dr->set_impl (the_reader); + this->impl_->on_sample_rejected (dds_reader.in (), ddsstatus); #else - this->impl_->on_sample_rejected (the_reader, status); + this->impl_->on_sample_rejected (the_reader, status); #endif - } + } - void - RTI_SubscriberListener_i::on_liveliness_changed ( - ::DDSDataReader* the_reader, - const ::DDS_LivelinessChangedStatus & status) - { - DDS4CCM_TRACE ("RTI_SubscriberListener_i::on_liveliness_changed"); + void + CCM_DDS_SubscriberListener_i::on_liveliness_changed ( + ::DDSDataReader* the_reader, + const ::DDS_LivelinessChangedStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_liveliness_changed"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::LivelinessChangedStatus ddsstatus; - ddsstatus <<= status; - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, RTI_DataReader_i ()); - RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ()); - rti_dr->set_impl (the_reader); - this->impl_->on_liveliness_changed (dds_reader.in (), ddsstatus); + ::DDS::LivelinessChangedStatus ddsstatus; + ddsstatus <<= status; + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, CCM_DDS_DataReader_i ()); + CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ()); + rti_dr->set_impl (the_reader); + this->impl_->on_liveliness_changed (dds_reader.in (), ddsstatus); #else - this->impl_->on_liveliness_changed (the_reader, status); + this->impl_->on_liveliness_changed (the_reader, status); #endif - } + } - void - RTI_SubscriberListener_i::on_data_available ( - ::DDSDataReader* the_reader) - { - DDS4CCM_TRACE ("RTI_SubscriberListener_i::on_data_available"); + void + CCM_DDS_SubscriberListener_i::on_data_available ( + ::DDSDataReader* the_reader) + { + DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_data_available"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, RTI_DataReader_i ()); - RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ()); - rti_dr->set_impl (the_reader); - this->impl_->on_data_available (dds_reader.in ()); + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, CCM_DDS_DataReader_i ()); + CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ()); + rti_dr->set_impl (the_reader); + this->impl_->on_data_available (dds_reader.in ()); #else - this->impl_->on_data_available (the_reader); + this->impl_->on_data_available (the_reader); #endif - } + } - void - RTI_SubscriberListener_i::on_subscription_matched ( - ::DDSDataReader* the_reader, - const ::DDS_SubscriptionMatchedStatus & status) - { - DDS4CCM_TRACE ("RTI_SubscriberListener_i::on_subscription_matched"); + void + CCM_DDS_SubscriberListener_i::on_subscription_matched ( + ::DDSDataReader* the_reader, + const ::DDS_SubscriptionMatchedStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_subscription_matched"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::SubscriptionMatchedStatus ddsstatus; - ddsstatus <<= status; - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, RTI_DataReader_i ()); - RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ()); - rti_dr->set_impl (the_reader); - this->impl_->on_subscription_matched (dds_reader.in (), ddsstatus); + ::DDS::SubscriptionMatchedStatus ddsstatus; + ddsstatus <<= status; + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, CCM_DDS_DataReader_i ()); + CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ()); + rti_dr->set_impl (the_reader); + this->impl_->on_subscription_matched (dds_reader.in (), ddsstatus); #else - this->impl_->on_subscription_matched (the_reader, status); + this->impl_->on_subscription_matched (the_reader, status); #endif - } + } - void - RTI_SubscriberListener_i::on_sample_lost ( - ::DDSDataReader* the_reader, - const ::DDS_SampleLostStatus & status) - { - DDS4CCM_TRACE ("RTI_SubscriberListener_i::on_sample_lost"); + void + CCM_DDS_SubscriberListener_i::on_sample_lost ( + ::DDSDataReader* the_reader, + const ::DDS_SampleLostStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_sample_lost"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::SampleLostStatus ddsstatus; - ddsstatus <<= status; - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, RTI_DataReader_i ()); - RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ()); - rti_dr->set_impl (the_reader); - this->impl_->on_sample_lost (dds_reader.in (), ddsstatus); + ::DDS::SampleLostStatus ddsstatus; + ddsstatus <<= status; + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, CCM_DDS_DataReader_i ()); + CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ()); + rti_dr->set_impl (the_reader); + this->impl_->on_sample_lost (dds_reader.in (), ddsstatus); #else - this->impl_->on_sample_lost (the_reader, status); + this->impl_->on_sample_lost (the_reader, status); #endif - } + } - ::DDS::SubscriberListener_ptr - RTI_SubscriberListener_i::get_subscriber_listener (void) - { - return ::DDS::SubscriberListener::_duplicate (this->impl_.in ()); - } + ::DDS::SubscriberListener_ptr + CCM_DDS_SubscriberListener_i::get_subscriber_listener (void) + { + return ::DDS::SubscriberListener::_duplicate (this->impl_.in ()); } } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h index afac9aaf915..aecff4d659d 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h @@ -35,61 +35,58 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_SubscriberListener_i : + public virtual ::DDSSubscriberListener { - class DDS4CCM_NDDS_IMPL_Export RTI_SubscriberListener_i : - public virtual ::DDSSubscriberListener - { - public: - // Constructor - RTI_SubscriberListener_i ( ::DDS::SubscriberListener_ptr s); - - // Destructor - virtual ~RTI_SubscriberListener_i (void); - - virtual void - on_requested_deadline_missed ( - ::DDSDataReader* the_reader, - const ::DDS_RequestedDeadlineMissedStatus & status); - - virtual void - on_requested_incompatible_qos ( - ::DDSDataReader* the_reader, - const ::DDS_RequestedIncompatibleQosStatus & status); - - virtual void - on_sample_rejected ( - ::DDSDataReader* the_reader, - const ::DDS_SampleRejectedStatus & status); - - virtual void - on_liveliness_changed ( - ::DDSDataReader* the_reader, - const ::DDS_LivelinessChangedStatus & status); - - virtual void - on_data_available ( - ::DDSDataReader* the_reader); - - virtual void - on_subscription_matched ( - ::DDSDataReader* the_reader, - const ::DDS_SubscriptionMatchedStatus & status); - - virtual void - on_sample_lost ( - ::DDSDataReader* the_reader, - const ::DDS_SampleLostStatus & status); - - virtual void - on_data_on_readers ( - ::DDSSubscriber* the_subscriber); - - ::DDS::SubscriberListener_ptr get_subscriber_listener (void); - private: - ::DDS::SubscriberListener_var impl_; - }; - } + public: + /// Constructor + CCM_DDS_SubscriberListener_i ( ::DDS::SubscriberListener_ptr s); + + /// Destructor + virtual ~CCM_DDS_SubscriberListener_i (void); + + virtual void + on_requested_deadline_missed ( + ::DDSDataReader* the_reader, + const ::DDS_RequestedDeadlineMissedStatus & status); + + virtual void + on_requested_incompatible_qos ( + ::DDSDataReader* the_reader, + const ::DDS_RequestedIncompatibleQosStatus & status); + + virtual void + on_sample_rejected ( + ::DDSDataReader* the_reader, + const ::DDS_SampleRejectedStatus & status); + + virtual void + on_liveliness_changed ( + ::DDSDataReader* the_reader, + const ::DDS_LivelinessChangedStatus & status); + + virtual void + on_data_available ( + ::DDSDataReader* the_reader); + + virtual void + on_subscription_matched ( + ::DDSDataReader* the_reader, + const ::DDS_SubscriptionMatchedStatus & status); + + virtual void + on_sample_lost ( + ::DDSDataReader* the_reader, + const ::DDS_SampleLostStatus & status); + + virtual void + on_data_on_readers ( + ::DDSSubscriber* the_subscriber); + + ::DDS::SubscriberListener_ptr get_subscriber_listener (void); + private: + ::DDS::SubscriberListener_var impl_; + }; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp index b7a2218fdda..d53e7e0cb17 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp @@ -167,19 +167,19 @@ namespace CIAO ::DDS::DomainParticipant_ptr CCM_DDS_Topic_i::get_participant (void) { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSDomainParticipant* p = this->impl ()->get_participant (); ACE_NEW_THROW_EX (retval, - ::CIAO::DDS4CCM::RTI::RTI_DomainParticipant_i (), + CCM_DDS_DomainParticipant_i (p), CORBA::NO_MEMORY ()); - - DDSDomainParticipant* p = this->impl ()->get_participant (); - ::CIAO::DDS4CCM::RTI::RTI_DomainParticipant_i *rti_dp = dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DomainParticipant_i *> (retval.in ()); - rti_dp->set_impl (p); - return retval._retn (); #else - return this->impl ()->get_participant (); + ::DDS::DomainParticipant_var p = this->impl ()->get_participant (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (p.in ()), + CORBA::NO_MEMORY ()); #endif + return retval._retn (); } DDSTopic * diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp index fe844488904..f9f8fc37b4c 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp @@ -45,16 +45,14 @@ namespace CIAO { ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSDomainParticipant* p = this->impl ()->get_participant (); ACE_NEW_THROW_EX (retval, - ::CIAO::DDS4CCM::RTI::RTI_DomainParticipant_i (), + CCM_DDS_DomainParticipant_i (p), CORBA::NO_MEMORY ()); - DDSDomainParticipant* p = this->impl ()->get_participant (); - ::CIAO::DDS4CCM::RTI::RTI_DomainParticipant_i *rti_dp = dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DomainParticipant_i *> (retval.in ()); - rti_dp->set_impl (p); #else ::DDS::DomainParticipant_var p = this->impl ()->get_participant (); ACE_NEW_THROW_EX (retval, - RTI_DomainParticipant_i (p.in ()), + CCM_DDS_DomainParticipant_i (p.in ()), CORBA::NO_MEMORY ()); #endif return retval._retn (); diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.cpp index e2df1db5398..da03259c7ab 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.cpp @@ -6,56 +6,56 @@ #include "dds4ccm/impl/logger/Log_Macros.h" template <typename DDS_TYPE, typename CCM_TYPE> -CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::Updater_T (void) +CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::Updater_T (void) : InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, typename CCM_TYPE::updater_type> (), is_global_scope_ (false), is_coherent_write_ (false) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::Updater_T"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::Updater_T"); } template <typename DDS_TYPE, typename CCM_TYPE> -CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::~Updater_T (void) +CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::~Updater_T (void) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::~Updater_T"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::~Updater_T"); } template <typename DDS_TYPE, typename CCM_TYPE> bool -CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::is_global_scope () +CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::is_global_scope () { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::is_global_scope"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::is_global_scope"); return this->is_global_scope_; } template <typename DDS_TYPE, typename CCM_TYPE> bool -CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::is_coherent_write () +CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::is_coherent_write () { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::is_coherent_write"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::is_coherent_write"); return this->is_coherent_write_; } template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::is_coherent_write (bool value) +CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::is_coherent_write (bool value) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::is_coherent_write"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::is_coherent_write"); this->is_coherent_write_ = value; } template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::create_i ( +CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::create_i ( const typename DDS_TYPE::value_type & an_instance, ::CCM_DDS::DataNumber_t index) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::create_i"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::create_i"); DDS_InstanceHandle_t const hnd = this->impl ()->register_instance (an_instance); if (DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) { DDS4CCM_ERROR (1, (LM_ERROR, - ACE_TEXT ("CIAO::DDS4CCM::RTI::Updater_T::create_i: ") + ACE_TEXT ("CIAO::DDS4CCM::Updater_T::create_i: ") ACE_TEXT ("Unable to unregister instance, nil handle.\n"))); throw CCM_DDS::InternalError (::DDS_RETCODE_ERROR, index); } @@ -63,7 +63,7 @@ CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::create_i ( if (result != DDS_RETCODE_OK) { DDS4CCM_ERROR (1, (LM_ERROR, - ACE_TEXT ("CIAO::DDS4CCM::RTI::Updater_T::create_i: ") + ACE_TEXT ("CIAO::DDS4CCM::Updater_T::create_i: ") ACE_TEXT ("Unable to update data, error %C.\n"), translate_retcode (result))); throw CCM_DDS::InternalError (result, index); @@ -72,10 +72,10 @@ CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::create_i ( template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::create_one ( +CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::create_one ( const typename DDS_TYPE::value_type & an_instance) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::create_one"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::create_one"); DDS_InstanceHandle_t const hnd = this->impl ()->lookup_instance (an_instance); if (!DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) { @@ -87,19 +87,19 @@ CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::create_one ( template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::update_i ( +CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::update_i ( const typename DDS_TYPE::value_type & an_instance, const ::DDS::InstanceHandle_t & instance_handle, ::CCM_DDS::DataNumber_t index) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::update_i"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::update_i"); DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL; hnd <<= instance_handle; ::DDS_ReturnCode_t const result = this->impl ()->write (an_instance, hnd); if (result != DDS_RETCODE_OK) { DDS4CCM_ERROR (1, (LM_ERROR, - ACE_TEXT ("CIAO::DDS4CCM::RTI::Updater_T::update_i: ") + ACE_TEXT ("CIAO::DDS4CCM::Updater_T::update_i: ") ACE_TEXT ("Unable to update data, error %C.\n"), translate_retcode (result))); throw CCM_DDS::InternalError (result, index); @@ -108,11 +108,11 @@ CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::update_i ( template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::update_one ( +CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::update_one ( const typename DDS_TYPE::value_type & an_instance, const ::DDS::InstanceHandle_t & instance_handle) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::update_one"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::update_one"); DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL; hnd <<= instance_handle; if (DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) @@ -140,19 +140,19 @@ CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::update_one ( template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::delete_i ( +CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::delete_i ( const typename DDS_TYPE::value_type & an_instance, const ::DDS::InstanceHandle_t & instance_handle, ::CCM_DDS::DataNumber_t index) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::delete_i"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::delete_i"); DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL; hnd <<= instance_handle; ::DDS_ReturnCode_t result = this->impl ()->dispose (an_instance, hnd); if (result != DDS_RETCODE_OK) { DDS4CCM_ERROR (1, (LM_ERROR, - ACE_TEXT ("CIAO::DDS4CCM::RTI::Updater_T::delete_i: ") + ACE_TEXT ("CIAO::DDS4CCM::Updater_T::delete_i: ") ACE_TEXT ("Unable to dispose instance, error %C.\n"), translate_retcode (result))); throw CCM_DDS::InternalError (result, index); @@ -162,7 +162,7 @@ CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::delete_i ( if (result != DDS_RETCODE_OK) { DDS4CCM_ERROR (1, (LM_ERROR, - ACE_TEXT ("CIAO::DDS4CCM::RTI::Updater_T::delete_i: ") + ACE_TEXT ("CIAO::DDS4CCM::Updater_T::delete_i: ") ACE_TEXT ("Unable to unregister instance, error %C.\n"), translate_retcode (result))); throw CCM_DDS::InternalError (result, index); @@ -171,11 +171,11 @@ CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::delete_i ( template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::delete_one ( +CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::delete_one ( const typename DDS_TYPE::value_type & an_instance, const ::DDS::InstanceHandle_t & instance_handle) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::delete_one"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::delete_one"); DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL; hnd <<= instance_handle; if (DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) @@ -203,10 +203,10 @@ CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::delete_one ( template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::create_many ( +CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::create_many ( const typename CCM_TYPE::seq_type& data) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::create_many"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::create_many"); // Check for existance of instances this->check_already_created (data); @@ -222,7 +222,7 @@ CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::create_many ( template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::check_existent ( +CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::check_existent ( const typename CCM_TYPE::seq_type& data) { ::CCM_DDS::NonExistent exception; @@ -245,7 +245,7 @@ CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::check_existent ( template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::check_already_created ( +CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::check_already_created ( const typename CCM_TYPE::seq_type& data) { ::CCM_DDS::AlreadyCreated exception; @@ -268,10 +268,10 @@ CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::check_already_created ( template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::update_many ( +CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::update_many ( const typename CCM_TYPE::seq_type& data) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::update_many"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::update_many"); // Check for existance of instances this->check_existent (data); @@ -286,10 +286,10 @@ CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::update_many ( template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::delete_many ( +CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::delete_many ( const typename CCM_TYPE::seq_type& data) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::delete_many"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::delete_many"); // Check for existance of instances this->check_existent (data); diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.h b/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.h index 130f642dd3c..49ab380604e 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.h @@ -17,70 +17,67 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + template <typename DDS_TYPE, typename CCM_TYPE> + class Updater_T : + public InstanceHandleManager_T <DDS_TYPE, CCM_TYPE, typename CCM_TYPE::updater_type> { - template <typename DDS_TYPE, typename CCM_TYPE> - class Updater_T : - public InstanceHandleManager_T <DDS_TYPE, CCM_TYPE, typename CCM_TYPE::updater_type> - { - public: - /// Constructor - Updater_T (void); + public: + /// Constructor + Updater_T (void); - /// Destructor - virtual ~Updater_T (void); + /// Destructor + virtual ~Updater_T (void); - virtual void create_one ( - const typename DDS_TYPE::value_type& an_instance); + virtual void create_one ( + const typename DDS_TYPE::value_type& an_instance); - virtual void update_one ( - const typename DDS_TYPE::value_type& an_instance, - const ::DDS::InstanceHandle_t & instance_handle); + virtual void update_one ( + const typename DDS_TYPE::value_type& an_instance, + const ::DDS::InstanceHandle_t & instance_handle); - virtual void delete_one ( - const typename DDS_TYPE::value_type& an_instance, - const ::DDS::InstanceHandle_t & instance_handle); + virtual void delete_one ( + const typename DDS_TYPE::value_type& an_instance, + const ::DDS::InstanceHandle_t & instance_handle); - virtual void create_many ( - const typename CCM_TYPE::seq_type& data); + virtual void create_many ( + const typename CCM_TYPE::seq_type& data); - virtual void update_many ( - const typename CCM_TYPE::seq_type& data); + virtual void update_many ( + const typename CCM_TYPE::seq_type& data); - virtual void delete_many ( - const typename CCM_TYPE::seq_type& data); + virtual void delete_many ( + const typename CCM_TYPE::seq_type& data); - virtual bool is_global_scope (); + virtual bool is_global_scope (); - virtual bool is_coherent_write (); + virtual bool is_coherent_write (); - virtual void is_coherent_write (bool value_); + virtual void is_coherent_write (bool value_); - private: - void create_i ( - const typename DDS_TYPE::value_type& an_instance, - ::CCM_DDS::DataNumber_t index); + private: + void create_i ( + const typename DDS_TYPE::value_type& an_instance, + ::CCM_DDS::DataNumber_t index); - void update_i ( - const typename DDS_TYPE::value_type& an_instance, - const ::DDS::InstanceHandle_t & instance_handle, - ::CCM_DDS::DataNumber_t index); + void update_i ( + const typename DDS_TYPE::value_type& an_instance, + const ::DDS::InstanceHandle_t & instance_handle, + ::CCM_DDS::DataNumber_t index); - void delete_i ( - const typename DDS_TYPE::value_type& an_instance, - const ::DDS::InstanceHandle_t & instance_handle, - ::CCM_DDS::DataNumber_t index); + void delete_i ( + const typename DDS_TYPE::value_type& an_instance, + const ::DDS::InstanceHandle_t & instance_handle, + ::CCM_DDS::DataNumber_t index); - void check_existent ( - const typename CCM_TYPE::seq_type& data); + void check_existent ( + const typename CCM_TYPE::seq_type& data); - void check_already_created ( - const typename CCM_TYPE::seq_type& data); + void check_already_created ( + const typename CCM_TYPE::seq_type& data); - bool is_global_scope_; - bool is_coherent_write_; - }; - } + bool is_global_scope_; + bool is_coherent_write_; + }; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.cpp index 489f822eecc..e0a83492589 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.cpp @@ -7,27 +7,27 @@ #include "dds4ccm/impl/logger/Log_Macros.h" template <typename DDS_TYPE, typename CCM_TYPE > -CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::Writer_T (void) +CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE>::Writer_T (void) : InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, typename CCM_TYPE::writer_type> (), is_coherent_write_ (false) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Writer_T::Writer_T"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::Writer_T"); } template <typename DDS_TYPE, typename CCM_TYPE > -CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::~Writer_T (void) +CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE>::~Writer_T (void) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Writer_T::~Writer_T"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::~Writer_T"); } template <typename DDS_TYPE, typename CCM_TYPE > void -CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::write_i ( +CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE>::write_i ( const typename DDS_TYPE::value_type& datum, const ::DDS::InstanceHandle_t& instance_handle, ::CCM_DDS::DataNumber_t index) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Writer_T::write_i"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::write_i"); ::DDS_InstanceHandle_t handle = ::DDS_HANDLE_NIL; handle <<= instance_handle; @@ -35,7 +35,7 @@ CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::write_i ( if (retval != DDS_RETCODE_OK) { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Writer_T::write_i - " + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::Writer_T::write_i - " "Write unsuccessful, received error code %C\n", translate_retcode (retval))); throw CCM_DDS::InternalError (retval, index); @@ -44,29 +44,29 @@ CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::write_i ( template <typename DDS_TYPE, typename CCM_TYPE > void -CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::write_one ( +CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE>::write_one ( const typename DDS_TYPE::value_type & an_instance, const ::DDS::InstanceHandle_t & instance_handle) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Writer_T::write_one"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::write_one"); this->write_i (an_instance, instance_handle, 0); - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CIAO::DDS4CCM::RTI::Writer_T::write_one - " + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CIAO::DDS4CCM::Writer_T::write_one - " "Write successful\n")); } template <typename DDS_TYPE, typename CCM_TYPE > void -CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::write_many ( +CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE>::write_many ( const typename CCM_TYPE::seq_type& instances) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Writer_T::write_many"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::write_many"); Coherent_Changes_Guard guard (this->impl ()->get_publisher(), this->is_coherent_write_); - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CIAO::DDS4CCM::RTI::Writer_T::write_many - " + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CIAO::DDS4CCM::Writer_T::write_many - " "Preparing to write to DDS\n")); for (typename CCM_TYPE::seq_type::size_type index = 0; @@ -76,20 +76,20 @@ CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::write_many ( this->write_i (instances[index], ::DDS::HANDLE_NIL, index); } - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CIAO::DDS4CCM::RTI::Writer_T::write_many - " + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CIAO::DDS4CCM::Writer_T::write_many - " "Write successful\n")); } template <typename DDS_TYPE, typename CCM_TYPE > ::CORBA::Boolean -CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::is_coherent_write (void) +CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE>::is_coherent_write (void) { return this->is_coherent_write_; } template <typename DDS_TYPE, typename CCM_TYPE > void -CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::is_coherent_write ( +CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE>::is_coherent_write ( ::CORBA::Boolean value) { this->is_coherent_write_ = value; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h index 4d94259cca1..2565f8337e8 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h @@ -18,38 +18,35 @@ namespace CIAO { namespace DDS4CCM { - namespace RTI + template <typename DDS_TYPE, typename CCM_TYPE> + class Writer_T : + public InstanceHandleManager_T <DDS_TYPE, CCM_TYPE, typename CCM_TYPE::writer_type> { - template <typename DDS_TYPE, typename CCM_TYPE> - class Writer_T : - public InstanceHandleManager_T <DDS_TYPE, CCM_TYPE, typename CCM_TYPE::writer_type> - { - public: - /// Constructor - Writer_T (void); + public: + /// Constructor + Writer_T (void); - /// Destructor - virtual ~Writer_T (void); + /// Destructor + virtual ~Writer_T (void); - virtual void write_one ( - const typename DDS_TYPE::value_type& an_instance, - const ::DDS::InstanceHandle_t & instance_handle); + virtual void write_one ( + const typename DDS_TYPE::value_type& an_instance, + const ::DDS::InstanceHandle_t & instance_handle); - virtual void write_many ( - const typename CCM_TYPE::seq_type& instances); + virtual void write_many ( + const typename CCM_TYPE::seq_type& instances); - virtual ::CORBA::Boolean is_coherent_write (void); + virtual ::CORBA::Boolean is_coherent_write (void); - virtual void is_coherent_write ( ::CORBA::Boolean value); + virtual void is_coherent_write ( ::CORBA::Boolean value); - private: - void write_i (const typename DDS_TYPE::value_type& datum, - const ::DDS::InstanceHandle_t& instance_handle, - ::CCM_DDS::DataNumber_t index); + private: + void write_i (const typename DDS_TYPE::value_type& datum, + const ::DDS::InstanceHandle_t& instance_handle, + ::CCM_DDS::DataNumber_t index); - bool is_coherent_write_; - }; - } + bool is_coherent_write_; + }; } } |