diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-05-15 11:29:43 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-05-15 11:29:43 +0000 |
| commit | 22774f058e6765849525ad20dccce7d86dfa7d19 (patch) | |
| tree | 7e8b1735591874596f240206aec2a5b8f1bda238 | |
| parent | 85cc22082adecd81ebb4d543a76ed4dbbbabe2de (diff) | |
| download | ATCD-22774f058e6765849525ad20dccce7d86dfa7d19.tar.gz | |
Tue May 15 11:29:04 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* examples/RTCORBA/Activity/Task_Stats.cpp:
* orbsvcs/tests/Event/lib/Supplier.h:
* orbsvcs/tests/Event/lib/Supplier.cpp:
Use ACE_High_Res_Timer::global_scale_factor_type
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/examples/RTCORBA/Activity/Task_Stats.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Event/lib/Supplier.cpp | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Event/lib/Supplier.h | 6 |
4 files changed, 16 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ce41d33342a..2ccd29c1ecf 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Tue May 15 11:29:04 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/RTCORBA/Activity/Task_Stats.cpp: + * orbsvcs/tests/Event/lib/Supplier.h: + * orbsvcs/tests/Event/lib/Supplier.cpp: + Use ACE_High_Res_Timer::global_scale_factor_type + Tue May 15 06:59:12 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * examples/RTCORBA/Activity/Task_Stats.h: diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp index f4ab9ac7ae2..a17b0056c27 100644 --- a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp +++ b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp @@ -134,8 +134,8 @@ Task_Stats::dump_latency_stats ( ACE_UINT32 l_dev = ACE_CU64_TO_CU32 (l_dev_); */ - double l_avg = ACE_CU64_TO_CU32 (avg) / sf; - double l_dev = ACE_CU64_TO_CU32 (dev) / (sf * sf); + double l_avg = avg / sf; + double l_dev = dev / (sf * sf); ACE_UINT64 tmin_ = this->time_inv_[0] / sf; ACE_UINT32 tmin = ACE_CU64_TO_CU32 (tmin_); diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp index d7f95265e8d..8e0a7ea4629 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp @@ -167,8 +167,9 @@ EC_Supplier::disconnect_push_supplier (void) } void -EC_Supplier::dump_results (const ACE_TCHAR* name, - ACE_UINT32 gsf) +EC_Supplier::dump_results ( + const ACE_TCHAR* name, + ACE_High_Res_Timer::global_scale_factor_type gsf) { this->throughput_.dump_results (name, gsf); } diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h index c9ae8ba6049..1991fc6af01 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.h +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h @@ -23,6 +23,7 @@ #include "orbsvcs/RtecEventChannelAdminC.h" #include "ace/Task.h" #include "ace/OS_NS_time.h" +#include "ace/High_Res_Timer.h" /** * @class EC_Supplier @@ -83,8 +84,9 @@ public: void shutdown (void); /// Dump the results... - virtual void dump_results (const ACE_TCHAR* name, - ACE_UINT32 global_scale_factor); + virtual void dump_results ( + const ACE_TCHAR* name, + ACE_High_Res_Timer::global_scale_factor_type global_scale_factor); /// Add our statistics to <stats> void accumulate (ACE_Throughput_Stats& stats) const; |