Sun May 13 17:22:16 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

        * examples/Kokyu_dsrt_schedulers/Task_Stats.h:
        * examples/Kokyu_dsrt_schedulers/Task_Stats.cpp:
        * examples/Kokyu_dsrt_schedulers/fp_example/server.cpp:
        * examples/Kokyu_dsrt_schedulers/mif_example/server.cpp:
        * examples/Kokyu_dsrt_schedulers/muf_example/server.cpp:
        * examples/RTScheduling/DT_Creator.h:
        * orbsvcs/performance-tests/RTEvent/lib/Client_Group.h:
        * orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp:
        * orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h:
        * orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp:
        * orbsvcs/performance-tests/RTEvent/lib/Consumer.h:
        * orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp:
        * orbsvcs/tests/EC_Throughput/ECT_Consumer.h:
        * orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp:
        * orbsvcs/tests/EC_Throughput/ECT_Supplier.h:
        * orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp:
        * orbsvcs/tests/Notify/lib/Task_Stats.h:
          Use ACE_High_Res_Timer::global_scale_factor_type

18 files changed, 44 insertions, 25 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 59f921ddd74..602f1346d58 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,24 @@
+Sun May 13 17:22:16 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Kokyu_dsrt_schedulers/Task_Stats.h:
+        * examples/Kokyu_dsrt_schedulers/Task_Stats.cpp:
+        * examples/Kokyu_dsrt_schedulers/fp_example/server.cpp:
+        * examples/Kokyu_dsrt_schedulers/mif_example/server.cpp:
+        * examples/Kokyu_dsrt_schedulers/muf_example/server.cpp:
+        * examples/RTScheduling/DT_Creator.h:
+        * orbsvcs/performance-tests/RTEvent/lib/Client_Group.h:
+        * orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp:
+        * orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h:
+        * orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp:
+        * orbsvcs/performance-tests/RTEvent/lib/Consumer.h:
+        * orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp:
+        * orbsvcs/tests/EC_Throughput/ECT_Consumer.h:
+        * orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp:
+        * orbsvcs/tests/EC_Throughput/ECT_Supplier.h:
+        * orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp:
+        * orbsvcs/tests/Notify/lib/Task_Stats.h:
+          Use ACE_High_Res_Timer::global_scale_factor_type
+
 Sun May 13 12:48:34 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * MPC/config/rlecompressor.mpb:
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
index 5df23a27801..221cebbf5e6 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
@@ -55,8 +55,7 @@ Task_Stats::end_time (ACE_hrtime_t time)
 }
 
 void
-Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
-                          ACE_UINT32)
+Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg)
 {
   FILE* output_file = ACE_OS::fopen (file_name, "w");
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h
index f3d7d4a300f..97c2d303a15 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h
@@ -61,8 +61,7 @@ class Kokyu_DSRT_Schedulers_Export Task_Stats
   /// Record a sample
   int sample (ACE_UINT32 thr_run_time, int thr_count);
 
-  void dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
-                     ACE_UINT32 scale_factor);
+  void dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg);
  protected:
   void dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf);
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
index 94d6ac16bd5..5900943be33 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
@@ -215,8 +215,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
   ACE_DEBUG ((LM_DEBUG, "Exiting main...\n"));
   task_stats.dump_samples (ACE_TEXT("timeline.txt"),
-                           ACE_TEXT("Time\t\tGUID"),
-                           ACE_High_Res_Timer::global_scale_factor ());
+                           ACE_TEXT("Time\t\tGUID"));
   return 0;
 }
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
index 93aabdb657b..95d01d23791 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
@@ -215,8 +215,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
   ACE_DEBUG ((LM_DEBUG, "Exiting main...\n"));
   task_stats.dump_samples (ACE_TEXT("timeline.txt"),
-                           ACE_TEXT("Time\t\tGUID"),
-                           ACE_High_Res_Timer::global_scale_factor ());
+                           ACE_TEXT("Time\t\tGUID"));
   return 0;
 }
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
index 28c209354c9..cfab2f8bd16 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
@@ -215,8 +215,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
   ACE_DEBUG ((LM_DEBUG, "Exiting main...\n"));
   task_stats.dump_samples (ACE_TEXT("timeline.txt"),
-                           ACE_TEXT("Time\t\tGUID"),
-                           ACE_High_Res_Timer::global_scale_factor ());
+                           ACE_TEXT("Time\t\tGUID"));
   return 0;
 }
 
diff --git a/TAO/examples/RTScheduling/DT_Creator.h b/TAO/examples/RTScheduling/DT_Creator.h
index d822dcecfc4..588c9cea24d 100644
--- a/TAO/examples/RTScheduling/DT_Creator.h
+++ b/TAO/examples/RTScheduling/DT_Creator.h
@@ -14,6 +14,7 @@
 #include "ace/Service_Config.h"
 #include "ace/Service_Object.h"
 #include "ace/Arg_Shifter.h"
+#include "ace/High_Res_Timer.h"
 
 class Thread_Task;
 class Task;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
index 957979b3786..cc6229632a3 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
@@ -18,7 +18,7 @@ Client_Group::init (CORBA::Long experiment_id,
                     CORBA::Long base_event_type,
                     CORBA::ULong iterations,
                     CORBA::Long workload_in_usecs,
-                    ACE_UINT32 gsf,
+                    ACE_High_Res_Timer::global_scale_factor_type gsf,
                     PortableServer::POA_ptr supplier_poa,
                     PortableServer::POA_ptr consumer_poa)
 {
@@ -33,7 +33,7 @@ Client_Group::init (CORBA::Long experiment_id,
                     CORBA::Long event_type_range,
                     CORBA::ULong iterations,
                     CORBA::Long workload_in_usecs,
-                    ACE_UINT32 gsf,
+                    ACE_High_Res_Timer::global_scale_factor_type gsf,
                     PortableServer::POA_ptr supplier_poa,
                     PortableServer::POA_ptr consumer_poa)
 {
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h
index 0f50a4bbc5a..a2e1fa2d27f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h
@@ -52,7 +52,7 @@ public:
              CORBA::Long base_event_type,
              CORBA::ULong iterations,
              CORBA::Long workload_in_usecs,
-             ACE_UINT32 gsf,
+             ACE_High_Res_Timer::global_scale_factor_type gsf,
              PortableServer::POA_ptr supplier_poa,
              PortableServer::POA_ptr consumer_poa);
 
@@ -66,7 +66,7 @@ public:
              CORBA::Long base_event_type_range,
              CORBA::ULong iterations,
              CORBA::Long workload_in_usecs,
-             ACE_UINT32 gsf,
+             ACE_High_Res_Timer::global_scale_factor_type gsf,
              PortableServer::POA_ptr supplier_poa,
              PortableServer::POA_ptr consumer_poa);
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
index f0762588e6f..9243d0ce2c5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
@@ -18,7 +18,7 @@ Client_Pair::init (CORBA::Long experiment_id,
                    CORBA::Long base_event_type,
                    CORBA::ULong iterations,
                    CORBA::Long workload_in_usecs,
-                   ACE_UINT32 gsf,
+                   ACE_High_Res_Timer::global_scale_factor_type gsf,
                    PortableServer::POA_ptr supplier_poa,
                    PortableServer::POA_ptr consumer_poa)
 {
@@ -39,7 +39,7 @@ Client_Pair::init (CORBA::Long experiment_id,
                    CORBA::Long source_event_range,
                    CORBA::ULong iterations,
                    CORBA::Long workload_in_usecs,
-                   ACE_UINT32 gsf,
+                   ACE_High_Res_Timer::global_scale_factor_type gsf,
                    PortableServer::POA_ptr supplier_poa,
                    PortableServer::POA_ptr consumer_poa)
 {
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h
index d88d5fbff53..59bb248d339 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h
@@ -52,7 +52,7 @@ public:
              CORBA::Long base_event_type,
              CORBA::ULong iterations,
              CORBA::Long workload_in_usecs,
-             ACE_UINT32 gsf,
+             ACE_High_Res_Timer::global_scale_factor_type gsf,
              PortableServer::POA_ptr supplier_poa,
              PortableServer::POA_ptr consumer_poa);
 
@@ -69,7 +69,7 @@ public:
              CORBA::Long source_event_range,
              CORBA::ULong iterations,
              CORBA::Long workload_in_usecs,
-             ACE_UINT32 gsf,
+             ACE_High_Res_Timer::global_scale_factor_type gsf,
              PortableServer::POA_ptr supplier_poa,
              PortableServer::POA_ptr consumer_poa);
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
index 6d588f69a1c..b4e9052a179 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
@@ -15,7 +15,7 @@ Consumer::Consumer (CORBA::Long experiment_id,
                     CORBA::Long event_type,
                     CORBA::ULong iterations,
                     CORBA::Long workload_in_usecs,
-                    ACE_UINT32 gsf,
+                    ACE_High_Res_Timer::global_scale_factor_type gsf,
                     PortableServer::POA_ptr poa)
   : experiment_id_ (experiment_id)
   , event_type_ (event_type)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
index c9109cc884c..1d7e9d3ffa3 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
@@ -13,6 +13,7 @@
 #include "orbsvcs/RtecEventChannelAdminC.h"
 
 #include "ace/Sample_History.h"
+#include "ace/High_Res_Timer.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -34,7 +35,7 @@ public:
             CORBA::Long event_type,
             CORBA::ULong iterations,
             CORBA::Long workload_in_usecs,
-            ACE_UINT32 gsf,
+            ACE_High_Res_Timer::global_scale_factor_type gsf,
             PortableServer::POA_ptr poa);
 
   /// Connect to the event channel
@@ -74,7 +75,7 @@ private:
   CORBA::ULong workload_in_usecs_;
 
   /// The global scale factor for the high resolution timers
-  ACE_UINT32 gsf_;
+  ACE_High_Res_Timer::global_scale_factor_type gsf_;
 
   /// The default poa
   PortableServer::POA_var default_POA_;
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index d651ccb46aa..9760a470f11 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -93,7 +93,7 @@ Test_Consumer::disconnect (void)
 
 void
 Test_Consumer::dump_results (const ACE_TCHAR* name,
-                             ACE_UINT32 gsf)
+                             ACE_Basic_Stats::scale_factor_type gsf)
 {
   this->throughput_.dump_results (name, gsf);
 }
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
index cf94e33386d..b87e5707fde 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
@@ -54,7 +54,7 @@ public:
   // Disconnect from the EC.
 
   void dump_results (const ACE_TCHAR* name,
-                     ACE_UINT32 global_scale_factor);
+                     ACE_Basic_Stats::scale_factor_type global_scale_factor);
   // Print out the results
 
   void accumulate (ACE_Throughput_Stats& stats) const;
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
index 99b7357252a..c9b269f3945 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
@@ -235,7 +235,7 @@ Test_Supplier::consumer_proxy (void)
 
 void
 Test_Supplier::dump_results (const ACE_TCHAR* name,
-                             ACE_UINT32 gsf)
+                             ACE_Basic_Stats::scale_factor_type gsf)
 {
   this->throughput_.dump_results (name, gsf);
 }
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
index 1c09a0d2efe..ddc36af837d 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
@@ -62,7 +62,7 @@ public:
   // are done here...
 
   void dump_results (const ACE_TCHAR* name,
-                     ACE_UINT32 global_scale_factor);
+                     ACE_Basic_Stats::scale_factor_type global_scale_factor);
   // Dump the results...
 
   void accumulate (ACE_Throughput_Stats& stats) const;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
index 6ee41b4cfb7..80c48c4f0fb 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
@@ -15,6 +15,7 @@
 
 #include "ace/OS_NS_time.h"
 #include "ace/Singleton.h"
+#include "ace/High_Res_Timer.h"
 #include "tao/orbconf.h"
 #include "tao/debug.h"
 #include "notify_test_export.h"