diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-03-30 09:14:18 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-03-30 09:14:18 +0000 |
| commit | 72ba364b928663c2928cd183fa0da0cfa4228bf7 (patch) | |
| tree | 47cd1340183c2f7637c89c3d98e664aff5b2fc6b | |
| parent | 507b76ac6e3f15437b3d0f59273521a03dbb0c05 (diff) | |
| download | ATCD-72ba364b928663c2928cd183fa0da0cfa4228bf7.tar.gz | |
Tue Mar 30 09:14:27 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.cpp:
* connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.h:
* connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp:
Fixed compile errors
4 files changed, 10 insertions, 6 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index ca4caef44c4..4674fb6587d 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Tue Mar 30 09:14:27 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.cpp: + * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.h: + * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp: + Fixed compile errors + Tue Mar 30 08:35:39 UTC 2010 Marcel Smit <msmit@remedy.nl> * connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc: diff --git a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.cpp index 702e49b92ff..fa2ee3b5141 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.cpp @@ -105,7 +105,7 @@ namespace CIAO_LatencyTT_Test_Receiver_Impl { ACE_DEBUG((LM_DEBUG, "SUMMARY RECEIVER:\n " "Total number of messages sent back: %u \n", - this->count_.value())); + this->count_)); } void diff --git a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.h index 9c8464e95f7..33da273e382 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.h @@ -19,7 +19,6 @@ namespace CIAO_LatencyTT_Test_Receiver_Impl { class Receiver_exec_i; - typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong; //============================================================ // LatencyTTTest_Listener_exec_i @@ -79,8 +78,7 @@ namespace CIAO_LatencyTT_Test_Receiver_Impl ::LatencyTT_Test::CCM_Receiver_Context_var context_; CCM_DDS::LatencyTTTest::Writer_var writer_; - Atomic_ULong count_; - + CORBA::ULong count_; }; extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr diff --git a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp index a747d87c5dc..30bfd17fcec 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp @@ -358,10 +358,9 @@ namespace CIAO_LatencyTT_Test_Sender_Impl void Sender_exec_i::record_time (ACE_UINT64 receive_time) { - ++this->count_; ACE_UINT64 interval = receive_time - this->start_time_; ACE_UINT64 duration = interval - this->_clock_overhead_; - int i = this->count_ + int i = ++this->count_; this->duration_times[i-1] = duration; this->sigma_duration_squared_ += (double)duration * (double)duration; this->tv_total_ += duration; |