diff options
Diffstat (limited to 'CIAO')
5 files changed, 15 insertions, 45 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index f6978fa0e50..8e65737a9af 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Mon Nov 16 19:13:55 UTC 2009 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl: + * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h: + * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp: + Removed updater and created writer. + Mon Nov 16 17:15:52 UTC 2009 Marcel Smit <msmit@remedy.nl> * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.h: diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl index e0a841ee15a..e670bca4ad6 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl @@ -17,7 +17,7 @@ module Unkeyed_Test { component Sender { - port CCM_DDS::UnkeyedTest::DDS_Update info_update; + port CCM_DDS::UnkeyedTest::DDS_Write info_in; attribute unsigned long rate; attribute unsigned short keys; attribute unsigned short iterations; diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp index 72a08ef91ce..4dbfc84b148 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp @@ -47,31 +47,12 @@ namespace CIAO_Unkeyed_Test_Sender_Impl void Sender_exec_i::tick () { - if (this->last_key->second->iteration == 0) - { - try - { - CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("Create key <%C>\n"), - this->last_key->first.c_str ())); - this->updater_->create (this->last_key->second); - } - catch (CCM_DDS::AlreadyCreated& ) - { - CIAO_ERROR ((LM_ERROR, ACE_TEXT ("keyedtest_info for <%C> already created.\n"), - this->last_key->first.c_str ())); - } - catch (CCM_DDS::InternalError& ) - { - CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating keyedtest_info for <%C>.\n"), - this->last_key->first.c_str ())); - } - } if (this->last_key != this->ktests_.end ()) { try { ++this->last_key->second->iteration; - this->updater_->update (this->last_key->second); + this->writer_->write (this->last_key->second); CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("Updated key <%C> with <%d>\n"), this->last_key->first.c_str (), this->last_key->second->iteration)); @@ -96,25 +77,6 @@ namespace CIAO_Unkeyed_Test_Sender_Impl { if (this->last_key->second->iteration == this->iterations_) { - //we're done with this one -> unregister it. - try - { - CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("Deleting key <%C> with <%d>\n"), - this->last_key->first.c_str (), - this->last_key->second->iteration)); - this->updater_->_cxx_delete (this->last_key->second); - } - catch (CCM_DDS::NonExistent& ) - { - CIAO_ERROR ((LM_ERROR, - ACE_TEXT ("keyedtest_info for <%C> not deleted: <%C> didn't exist.\n"), - this->last_key->first.c_str (), this->last_key->first.c_str ())); - } - catch (CCM_DDS::InternalError& ) - { - CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while deleting keyedtest_info for <%C>.\n"), - this->last_key->first.c_str ())); - } //next key ++this->last_key; } @@ -201,7 +163,7 @@ namespace CIAO_Unkeyed_Test_Sender_Impl void Sender_exec_i::configuration_complete (void) { - this->updater_ = this->context_->get_connection_info_update_data (); + this->writer_ = this->context_->get_connection_info_in_data (); } void diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h index 0613804dd79..b3215516c41 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h @@ -68,7 +68,7 @@ namespace CIAO_Unkeyed_Test_Sender_Impl void start (void); void stop (void); - CCM_DDS::UnkeyedTest::Updater_var updater_; + CCM_DDS::UnkeyedTest::Writer_var writer_; pulse_Generator * ticker_; ::Unkeyed_Test::CCM_Sender_Context_var context_; diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp index d7d79dfb6d6..256ec354583 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp @@ -387,15 +387,15 @@ </connection> <connection> - <name>updater_connection</name> + <name>writer_connection</name> <internalEndpoint> - <portName>info_update_data</portName> + <portName>info_in_data</portName> <provider>false</provider> <kind>SimplexReceptacle</kind> <instance xmi:idref="SenderComponentInstance" /> </internalEndpoint> <internalEndpoint> - <portName>info_update_data</portName> + <portName>info_in_data</portName> <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="Unkeyed_Test_ConnectorComponentInstance" /> |