diff options
19 files changed, 67 insertions, 78 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index b4f2c492b37..9b8e7b995b5 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,25 @@ +Fri Aug 27 11:35:09 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: + * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: + * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: + * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: + Initialize ACE_Thread_ID as part of the constructor initializers + Fri Aug 27 08:10:54 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp index 289f9ad6ee1..10e634ee70e 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp @@ -77,10 +77,9 @@ namespace CIAO_CSL_DeadlineTest_Sender_Impl // Sender_exec_i //============================================================ Sender_exec_i::Sender_exec_i (void) - : deadline_missed_ (false) + : deadline_missed_ (false), + thread_id_listener_ (0, 0) { - thread_id_listener_.id (0); - thread_id_listener_.handle (0); } Sender_exec_i::~Sender_exec_i (void) diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp index f02cc1fc2a9..caf1780ecc8 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp @@ -76,10 +76,10 @@ namespace CIAO_CSL_QoSTest_Receiver_Impl // Receiver_exec_i //============================================================ Receiver_exec_i::Receiver_exec_i (void) - : incompatible_ (false) + : incompatible_ (false), + thread_id_listener_ (0, 0) + { - thread_id_listener_.id (0); - thread_id_listener_.handle (0); } Receiver_exec_i::~Receiver_exec_i (void) diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp index 39fc56d0824..c63924a642a 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp @@ -73,10 +73,9 @@ namespace CIAO_CSL_QoSTest_Sender_Impl //============================================================ Sender_exec_i::Sender_exec_i (void) - : incompatible_ (false) + : incompatible_ (false), + thread_id_listener_ (0, 0) { - thread_id_listener_.id (0); - thread_id_listener_.handle (0); } Sender_exec_i::~Sender_exec_i (void) diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp index 149137b912e..14a86cd8149 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp @@ -143,10 +143,9 @@ namespace CIAO_CSL_SRTest_Receiver_Impl read_data_ (true), raw_listen_ (false), received_ (0), - rejected_(false) + rejected_(false), + thread_id_listener_ (0, 0) { - thread_id_listener_.id (0); - thread_id_listener_.handle (0); this->ticker_ = new read_action_Generator (*this); } diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp index 796d8429bc8..79836f5b2d3 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp @@ -143,13 +143,10 @@ namespace CIAO_CSL_USTest_Receiver_Impl Receiver_exec_i::Receiver_exec_i (void) : subscription_matched_received_ (false), liveliness_changed_received_ (false), - received_(0) + received_(0), + thread_id_listener_subscription_matched_ (0, 0), + thread_id_listener_liveliness_changed_ (0, 0) { - this->thread_id_listener_subscription_matched_.handle (0); - this->thread_id_listener_subscription_matched_.id (0); - this->thread_id_listener_liveliness_changed_.handle (0); - this->thread_id_listener_liveliness_changed_.id (0); - this->lc_ = ::CCM_DDS::DataListenerControl::_nil (); this->pulser_= new Pulser (*this); } diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp index bc88018d8b7..fcbfcd7c91d 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp @@ -131,17 +131,12 @@ namespace CIAO_CSL_USTest_Sender_Impl : publication_matched_received_ (false), liveliness_lost_received_ (false), reliable_dr_activity_changed_received_ (false), - reliable_writer_cache_changed_received_ (false) + reliable_writer_cache_changed_received_ (false), + thread_id_listener_publication_matched_ (0, 0), + thread_id_listener_liveliness_lost_ (0, 0), + thread_id_reliable_dr_activity_changed_ (0, 0), + thread_id_reliable_writer_cache_changed_ (0, 0) { - thread_id_listener_publication_matched_.id (0); - thread_id_listener_publication_matched_.handle (0); - thread_id_listener_liveliness_lost_.id (0); - thread_id_listener_liveliness_lost_.handle (0); - thread_id_reliable_dr_activity_changed_.id (0); - thread_id_reliable_dr_activity_changed_.handle (0); - thread_id_reliable_writer_cache_changed_.id (0); - thread_id_reliable_writer_cache_changed_.handle (0); - this->ticker_ = new pulse_Generator (*this); } diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp index a8c6298a817..58a89b96cb8 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp @@ -81,11 +81,9 @@ namespace CIAO_CFTLE_Test_Receiver_Impl : iterations_ (10), keys_ (5), samples_expected_ (keys_ * SAMPLES_PER_KEY), - samples_received_ (0) + samples_received_ (0), + thread_id_listener_ (0, 0) { - thread_id_listener_.id (0); - thread_id_listener_.handle (0); - } Receiver_exec_i::~Receiver_exec_i (void) diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp index c5e107546ef..31d9381e8d7 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp @@ -94,11 +94,9 @@ namespace CIAO_CFTLS_Test_Receiver_Impl : iterations_ (10), keys_ (5), samples_expected_ (keys_ * SAMPLES_PER_KEY), - samples_received_ (0) + samples_received_ (0), + thread_id_listener_ (0, 0) { - thread_id_listener_.id (0); - thread_id_listener_.handle (0); - } Receiver_exec_i::~Receiver_exec_i (void) diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp index f6ee526df7d..be3116c6498 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp @@ -75,11 +75,10 @@ namespace CIAO_LOBO_Test_Receiver_Impl : received_one_by_one_ (0), received_many_by_many_ (0), iterations_ (10), - keys_ (5) - { - thread_id_listener_.id (0); - thread_id_listener_.handle (0); + keys_ (5), + thread_id_listener_ (0, 0) + { } Receiver_exec_i::~Receiver_exec_i (void) diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp index 0a5d7222308..eacfc172b4f 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp @@ -67,10 +67,9 @@ namespace CIAO_OIT_Test_Receiver_Impl // Receiver_exec_i //============================================================ Receiver_exec_i::Receiver_exec_i (void) - : inconsistent_ (false) + : inconsistent_ (false), + thread_id_listener_ (0, 0) { - thread_id_listener_.id (0); - thread_id_listener_.handle (0); } Receiver_exec_i::~Receiver_exec_i (void) diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp index 64311086ad6..1144396eece 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp @@ -69,10 +69,9 @@ namespace CIAO_OIT_Test_Sender_Impl // Component Executor Implementation Class: Sender_exec_i //============================================================ Sender_exec_i::Sender_exec_i (void) - : inconsistent_ (false) + : inconsistent_ (false), + thread_id_listener_ (0, 0) { - thread_id_listener_.id (0); - thread_id_listener_.handle (0); } Sender_exec_i::~Sender_exec_i (void) diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp index dca52daff9a..d396a3177a7 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp @@ -127,13 +127,10 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl Receiver_exec_i::Receiver_exec_i (void) : rate_ (10), deadline_port_1_ (false), - deadline_port_2_ (false) + deadline_port_2_ (false), + thread_id_listener_1_ (0, 0), + thread_id_listener_2_ (0, 0) { - thread_id_listener_1_.id (0); - thread_id_listener_1_.handle (0); - thread_id_listener_2_.id (0); - thread_id_listener_2_.handle (0); - this->ticker_ = new read_action_Generator (*this); } diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp index 2eac7de57cb..a605c7b26ee 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp @@ -137,12 +137,10 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl Receiver_exec_i::Receiver_exec_i (void) : rate_ (10), sample_port_1_ (false), - sample_port_2_ (false) + sample_port_2_ (false), + thread_id_listener_1_ (0, 0), + thread_id_listener_2_ (0, 0) { - thread_id_listener_1_.id (0); - thread_id_listener_1_.handle (0); - thread_id_listener_2_.id (0); - thread_id_listener_2_.handle (0); this->ticker_ = new read_action_Generator (*this); } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp index fda63055693..368d4c4a70b 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp @@ -84,11 +84,9 @@ namespace CIAO_QCLE_Test_Receiver_Impl : iterations_ (10), keys_ (5), samples_expected_ (keys_ * SAMPLES_PER_KEY), - samples_received_ (0) + samples_received_ (0), + thread_id_listener_ (0, 0) { - thread_id_listener_.id (0); - thread_id_listener_.handle (0); - } Receiver_exec_i::~Receiver_exec_i (void) diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp index 1d0fb44e36e..d12cff5fd1d 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp @@ -93,11 +93,9 @@ namespace CIAO_QCLS_Test_Receiver_Impl : iterations_ (10), keys_ (5), samples_expected_ (keys_ * SAMPLES_PER_KEY), - samples_received_ (0) + samples_received_ (0), + thread_id_listener_ (0, 0) { - thread_id_listener_.id (0); - thread_id_listener_.handle (0); - } Receiver_exec_i::~Receiver_exec_i (void) diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp index 09e0c0e72e8..2ff097afb0c 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp @@ -149,13 +149,10 @@ namespace CIAO_QCTL_Test_Receiver_Impl samples_expected_1_ (keys_ * SAMPLES_PER_KEY_1), samples_received_1_ (0), samples_expected_2_ (keys_ * (this->iterations_ - 4)), - samples_received_2_ (0) + samples_received_2_ (0), + thread_id_listener_1_ (0, 0), + thread_id_listener_2_ (0, 0) { - thread_id_listener_1_.id (0); - thread_id_listener_1_.handle (0); - thread_id_listener_2_.id (0); - thread_id_listener_2_.handle (0); - } Receiver_exec_i::~Receiver_exec_i (void) diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp index f3b9524a101..a625821eb43 100644 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp @@ -123,11 +123,9 @@ namespace CIAO_SL_OneByOne_Receiver_Impl updater_data_ (0), on_creation_ (0), on_one_update_ (0), - on_deletion_ (0) + on_deletion_ (0), + thread_id_listener_ (0, 0) { - thread_id_listener_.id (0); - thread_id_listener_.handle (0); - } Receiver_exec_i::~Receiver_exec_i (void) diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp index d8539ec3715..854202ae6d4 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp @@ -69,10 +69,9 @@ namespace CIAO_Updater_Receiver_Impl //============================================================ // Receiver_exec_i //============================================================ - Receiver_exec_i::Receiver_exec_i (void) + Receiver_exec_i::Receiver_exec_i (void) : + thread_id_listener_ (0, 0) { - thread_id_listener_.id (0); - thread_id_listener_.handle (0); } Receiver_exec_i::~Receiver_exec_i (void) |