ChangeLogTag: Thu Dec 28 16:10:59 2000 Frank Hunleth <fhunleth@cs.wustl.edu>

4 files changed, 34 insertions, 7 deletions

diff --git a/performance-tests/Server_Concurrency/Latency_Stats.h b/performance-tests/Server_Concurrency/Latency_Stats.h
index 951a8ae110d..ccfba66ee66 100644
--- a/performance-tests/Server_Concurrency/Latency_Stats.h
+++ b/performance-tests/Server_Concurrency/Latency_Stats.h
@@ -35,7 +35,12 @@ inline void
 Latency_Stats::sample (ACE_hrtime_t sample)
 {
   this->sum_  += sample;
+#ifndef ACE_LACKS_LONGLONG_T
   this->sum2_ += sample * sample;
+#else
+  // possible loss of precision here due to lack of 64bit support
+  this->sum2_ += sample * sample.lo();
+#endif
   if (this->n_ == 0)
     {
       this->min_ = sample;
@@ -50,15 +55,19 @@ Latency_Stats::sample (ACE_hrtime_t sample)
 
 inline void
 Latency_Stats::dump_results (const char *test_name,
-                                          const char *sub_test)
+                             const char *sub_test)
 {
   if (this->n_ < 1)
     return;
 
   ACE_hrtime_t avg = this->sum_ / this->n_;
+#ifndef ACE_LACKS_LONGLONG_T
   ACE_hrtime_t dev =
     this->sum2_ / this->n_ - avg*avg;
-
+#else
+  ACE_hrtime_t dev =
+    this->sum2_ / this->n_ - avg.lo()*avg.lo();
+#endif
   ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
 
   double min_usec = ACE_CU64_TO_CU32 (this->min_) / gsf;
diff --git a/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp b/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
index 875f0bd2345..d03a62194e1 100644
--- a/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
+++ b/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
@@ -22,12 +22,12 @@ static ACE_hrtime_t start_of_burst;
 
 enum DEBUGGING_RANGE
 {
-  NONE = 0,
+  DEBUG_NONE = 0,
   DEFAULT = 1,
   PRINT_INDIVIDUAL_LATENCY = 2
 };
 
-static DEBUGGING_RANGE debug = NONE;
+static DEBUGGING_RANGE debug = DEBUG_NONE;
 
 typedef ACE_Task<ACE_MT_SYNCH> TASK;
 
@@ -170,9 +170,15 @@ Leader_Follower_Task::svc (void)
 
           if (debug >= PRINT_INDIVIDUAL_LATENCY)
             {
+#ifndef ACE_LACKS_LONGLONG_T
               ACE_DEBUG ((LM_DEBUG,
                           "(%t) latency from start of burst: %Q\n",
                           latency_from_start_of_burst));
+#else
+              ACE_DEBUG ((LM_DEBUG,
+                          "(%t) latency from start of burst: %u\n",
+                          latency_from_start_of_burst.lo()));
+#endif
             }
         }
     }
diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp b/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
index 81e8f006111..27b7274826d 100644
--- a/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
+++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
@@ -15,12 +15,12 @@ static size_t timeout_between_bursts = 1;
 
 enum DEBUGGING_RANGE
 {
-  NONE = 0,
+  DEBUG_NONE = 0,
   DEFAULT = 1,
   PRINT_INDIVIDUAL_LATENCY = 2
 };
 
-static DEBUGGING_RANGE debug = NONE;
+static DEBUGGING_RANGE debug = DEBUG_NONE;
 
 static ACE_Data_Block *data_block = 0;
 
@@ -140,9 +140,15 @@ Worker_Task::svc (void)
 
       if (debug >= PRINT_INDIVIDUAL_LATENCY)
         {
+#ifndef ACE_LACKS_LONGLONG_T
           ACE_DEBUG ((LM_DEBUG,
                       "(%t) latency from start of burst: %Q\n",
                       latency_from_start_of_burst));
+#else
+          ACE_DEBUG ((LM_DEBUG,
+                      "(%t) latency from start of burst: %u\n",
+                      latency_from_start_of_burst.lo()));
+#endif
         }
     }
 
diff --git a/performance-tests/UDP/udp_test.cpp b/performance-tests/UDP/udp_test.cpp
index 145e904bf81..45fa0988950 100644
--- a/performance-tests/UDP/udp_test.cpp
+++ b/performance-tests/UDP/udp_test.cpp
@@ -258,9 +258,15 @@ Client::run (void)
 
       if (i < 0 )
         {
+#ifndef ACE_LACKS_LONGLONG_T
           ACE_DEBUG ((LM_DEBUG,
                       "Ignoring first sample of %u usecs\n",
-                      (ACE_UINT32) (sample)));
+                       (ACE_UINT32) (sample)));
+#else
+          ACE_DEBUG ((LM_DEBUG,
+                      "Ignoring first sample of %u usecs\n",
+                      (ACE_UINT32) (sample.lo())));
+#endif
           continue;
         }
       else if (max_allow > 0  &&  sample > max_allow)