Sun May 13 12:27:03 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

        * ace/High_Res_Timer.h:
          Fixed typo

        * ace/Basic_Stats.h:
        * ace/Basic_Stats.cpp:
        * ace/Throughput_Stats.h:
        * ace/Throughput_Stats.cpp:
          Introduced scale_factor_type traits to handle the fact that the
          ACE HighResTimer scale factor is now ACE_UINT64

        * ace/Timeprobe_T.cpp:
          Use correct trait for the scale factor

        * performance-tests/RPC/client.cpp:
        * performance-tests/SCTP/SOCK_SEQPACK_clt.cpp:
        * performance-tests/SCTP/SOCK_STREAM_clt.cpp:
        * performance-tests/Server_Concurrency/Latency_Stats.h:
        * performance-tests/TCP/tcp_test.cpp:
          Use ACE_High_Res_Timer::global_scale_factor_type

5 files changed, 10 insertions, 5 deletions

diff --git a/ACE/performance-tests/RPC/client.cpp b/ACE/performance-tests/RPC/client.cpp
index 8c3fced9aed..3b5205f6505 100644
--- a/ACE/performance-tests/RPC/client.cpp
+++ b/ACE/performance-tests/RPC/client.cpp
@@ -65,7 +65,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     }
 
   ACE_DEBUG ((LM_DEBUG, "Calibrating high resolution timer . . ."));
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, " done\n"));
 
   throughput.dump_results ("Client", gsf);
diff --git a/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp b/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp
index fc41f2c7d3a..96c4bfde27f 100644
--- a/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp
+++ b/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp
@@ -36,7 +36,8 @@ extern "C" {
 // global constants
 ACE_CDR::UShort const primerIterations = 100;
 // ace/High_Res_Timer.h describes the need for the following.
-ACE_UINT32 const microsec_clock_scale_factor = ACE_High_Res_Timer::global_scale_factor();
+ACE_High_Res_Timer::global_scale_factor_type const microsec_clock_scale_factor
+  = ACE_High_Res_Timer::global_scale_factor();
 
 // forward declations of functions. Bodies follow main() to improve
 // file readability.
diff --git a/ACE/performance-tests/SCTP/SOCK_STREAM_clt.cpp b/ACE/performance-tests/SCTP/SOCK_STREAM_clt.cpp
index 9e560409c8f..57962b86d7c 100644
--- a/ACE/performance-tests/SCTP/SOCK_STREAM_clt.cpp
+++ b/ACE/performance-tests/SCTP/SOCK_STREAM_clt.cpp
@@ -37,7 +37,8 @@ extern "C" {
 // global constants
 ACE_CDR::UShort const primerIterations = 100;
 // ace/High_Res_Timer.h describes the need for the following.
-ACE_UINT32 const microsec_clock_scale_factor = ACE_High_Res_Timer::global_scale_factor();
+ACE_High_Res_Timer::global_scale_factor_type const microsec_clock_scale_factor =
+  ACE_High_Res_Timer::global_scale_factor();
 
 // forward declations of functions. Bodies follow main() to improve
 // file readability.
diff --git a/ACE/performance-tests/Server_Concurrency/Latency_Stats.h b/ACE/performance-tests/Server_Concurrency/Latency_Stats.h
index 2b0694b7ea7..f8772f770a1 100644
--- a/ACE/performance-tests/Server_Concurrency/Latency_Stats.h
+++ b/ACE/performance-tests/Server_Concurrency/Latency_Stats.h
@@ -68,7 +68,8 @@ Latency_Stats::dump_results (const ACE_TCHAR *test_name,
   ACE_hrtime_t dev =
     this->sum2_ / this->n_ - avg.lo()*avg.lo();
 #endif
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
 
   double min_usec = ACE_CU64_TO_CU32 (this->min_) / gsf;
   double max_usec = ACE_CU64_TO_CU32 (this->max_) / gsf;
diff --git a/ACE/performance-tests/TCP/tcp_test.cpp b/ACE/performance-tests/TCP/tcp_test.cpp
index 0e5996df6a2..2a3d2a461c3 100644
--- a/ACE/performance-tests/TCP/tcp_test.cpp
+++ b/ACE/performance-tests/TCP/tcp_test.cpp
@@ -250,7 +250,8 @@ Client::run (void)
     }
   ACE_hrtime_t test_end = ACE_OS::gethrtime ();
 
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_High_Res_Timer::global_scale_factor_type gsf =
+    ACE_High_Res_Timer::global_scale_factor ();
 
   if (dump_history)
     {