*** empty log message ***

5 files changed, 96 insertions, 77 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index ceec97d0911..46bb152c7f4 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,5 +1,11 @@
 Wed Nov 19 05:53:42 1997  Sergio Flores  <sergio@tango.cs.wustl.edu>
 
+	* tests/Cubit/TAO/DII_Cubit/clnt.cpp: 
+	* tests/Cubit/TAO/DII_Cubit/clnt.h: 
+	* tests/Cubit/TAO/IDL_Cubit/clnt.cpp: 	
+	* tests/Cubit/TAO/IDL_Cubit/clnt.h: Changed code to add loop
+ 	around all cube calls, and make output more consistent.
+
 	* orbsvcs/tests/Logger/Makefile: 
 	* orbsvcs/tests/Logger/ior_multicast.cpp:
 	* orbsvcs/tests/Logger/ior_multicast.h: Removed unneeded
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/clnt.cpp b/TAO/tests/Cubit/TAO/DII_Cubit/clnt.cpp
index bc2b83ff60c..c39b5aca018 100644
--- a/TAO/tests/Cubit/TAO/DII_Cubit/clnt.cpp
+++ b/TAO/tests/Cubit/TAO/DII_Cubit/clnt.cpp
@@ -487,6 +487,7 @@ Cubit_Client::cube_struct_dii (void)
 
   // Make the invocation, verify the result
 
+  this->call_count_++;
   req->invoke ();
 
   if (req->env ()->exception () != 0) 
@@ -506,6 +507,52 @@ Cubit_Client::cube_struct_dii (void)
   CORBA::release (req);
 }
 
+// prints time statistics
+
+void
+Cubit_Client::print_stats (const char *call_name, ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time)
+{
+  double tmp;
+
+  ACE_DEBUG ((LM_DEBUG,
+	      "%s:\n",
+	      call_name));
+  
+  if (this->call_count_ > 0  &&  this->error_count_ == 0)
+    {
+      tmp = 1000 / elapsed_time.real_time;
+
+      elapsed_time.real_time *= ACE_ONE_SECOND_IN_MSECS;
+      elapsed_time.user_time *= ACE_ONE_SECOND_IN_MSECS;
+      elapsed_time.system_time *= ACE_ONE_SECOND_IN_MSECS;
+
+      elapsed_time.real_time /= this->call_count_;
+      elapsed_time.user_time /= this->call_count_;
+      elapsed_time.system_time /= this->call_count_;
+
+      tmp = 1000 / elapsed_time.real_time;
+
+      ACE_DEBUG ((LM_DEBUG,
+		  "\treal_time\t= %0.06f ms, \n\t"
+		  "user_time\t= %0.06f ms, \n\t"
+		  "system_time\t= %0.06f ms\n"
+		  "\t%0.00f calls/second\n",
+		  elapsed_time.real_time < 0.0? 0.0:elapsed_time.real_time,
+		  elapsed_time.user_time < 0.0? 0.0:elapsed_time.user_time,
+		  elapsed_time.system_time < 0.0? 0.0:elapsed_time.system_time,
+		  tmp < 0.0? 0.0 : tmp));
+    }
+  else
+    {
+      ACE_ERROR ((LM_ERROR, "\tNo time stats printed.  Call count zero or error ocurred.\n"));
+    }
+
+  ACE_DEBUG ((LM_DEBUG,
+	      "\t%d calls, %d errors\n",
+	      this->call_count_,
+	      this->error_count_));
+}
+
 // Execute client example code.
 
 int
@@ -525,106 +572,65 @@ Cubit_Client::run (void)
   for (i = 0; i < this->loop_count_; i++)
     {
       this->cube_short (i);
-
       this->cube_octet (i);
-
       this->cube_long (i);
-
       this->cube_struct (i);
     }
 
   // stop the timer.
   timer.stop ();
 
+  timer.elapsed_time (elapsed_time);  
   // compute call average call time.
-  if (this->call_count_ > 0)
-    {
-      if (this->error_count_ == 0)
-        {
-	  timer.elapsed_time (elapsed_time);
-	  double tmp;
-
-	  elapsed_time.real_time *= ACE_ONE_SECOND_IN_MSECS;
-	  elapsed_time.user_time *= ACE_ONE_SECOND_IN_MSECS;
-	  elapsed_time.system_time *= ACE_ONE_SECOND_IN_MSECS;
-
-	  elapsed_time.real_time /= this->call_count_;
-	  elapsed_time.user_time /= this->call_count_;
-	  elapsed_time.system_time /= this->call_count_;
-
-	  tmp = 1000 / elapsed_time.real_time;
-
-	  ACE_DEBUG ((LM_DEBUG,
-		      "cube average call:\n\treal_time\t= %0.06f ms, \n\t"
-		      "user_time\t= %0.06f ms, \n\t"
-		      "system_time\t= %0.06f ms\n"
-		      "\t%0.00f calls/second\n",
-		      elapsed_time.real_time < 0.0? 0.0:elapsed_time.real_time,
-		      elapsed_time.user_time < 0.0? 0.0:elapsed_time.user_time,
-		      elapsed_time.system_time < 0.0? 0.0:elapsed_time.system_time,
-		      tmp < 0.0? 0.0 : tmp));
-
-        }
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "\t%d calls, %d errors\n",
-                  this->call_count_,
-                  this->error_count_));
-    }
+  this->print_stats ("cube average call", elapsed_time);
 
   // Simple test for DII: call "cube_struct". (It's not timed since
   // the copious mallocation of DII would bias numbers against typical
   // stub-based calls).
+  this->call_count_ = 0;
+  this->error_count_ = 0;
+
   timer.start ();
-  this->cube_struct_dii ();
+  // Make the calls in a loop.
+  for (i = 0; i < this->loop_count_; i++)
+    {
+      this->cube_struct_dii ();
+    }
   timer.stop ();
 
-  timer.elapsed_time (elapsed_time);
-  elapsed_time.real_time *= ACE_ONE_SECOND_IN_MSECS;
-  elapsed_time.user_time *= ACE_ONE_SECOND_IN_MSECS;
-  elapsed_time.system_time *= ACE_ONE_SECOND_IN_MSECS;
+  timer.elapsed_time (elapsed_time);  
+  // compute call average call time.
+  this->print_stats ("cube_struct_dii call", elapsed_time);
 
-  ACE_DEBUG ((LM_DEBUG,
-	      "cube_struct_dii() call:\n\treal_time\t= %0.06f ms, \n\t"
-	      "user_time\t= %0.06f ms, \n\t"
-	      "system_time\t= %f ms\n",
-	      elapsed_time.real_time < 0.0? 0.0:elapsed_time.real_time,
-	      elapsed_time.user_time < 0.0? 0.0:elapsed_time.user_time,
-	      elapsed_time.system_time < 0.0? 0.0:elapsed_time.system_time));
+  this->call_count_ = 0;
+  this->error_count_ = 0;
 
   timer.start ();
-  this->cube_union_stub ();
+  // Make the calls in a loop.
+  for (i = 0; i < this->loop_count_; i++)
+    {
+      this->cube_union_stub ();
+    }
   timer.stop ();
 
-  timer.elapsed_time (elapsed_time);
-  elapsed_time.real_time *= ACE_ONE_SECOND_IN_MSECS;
-  elapsed_time.user_time *= ACE_ONE_SECOND_IN_MSECS;
-  elapsed_time.system_time *= ACE_ONE_SECOND_IN_MSECS;
+  timer.elapsed_time (elapsed_time);  
+  // compute call average call time.
+  this->print_stats ("cube_union_stub call", elapsed_time);
 
-  ACE_DEBUG ((LM_DEBUG,
-	      "cube_union_stub() call:\n\treal_time\t= %0.06f ms, \n\t"
-	      "user_time\t= %0.06f ms, \n\t"
-	      "system_time\t= %0.06f ms\n",
-	      elapsed_time.real_time < 0.0? 0.0:elapsed_time.real_time,
-	      elapsed_time.user_time < 0.0? 0.0:elapsed_time.user_time,
-	      elapsed_time.system_time < 0.0? 0.0:elapsed_time.system_time));
+  this->call_count_ = 0;
+  this->error_count_ = 0;
 
   timer.start ();
-  this->cube_union_dii ();
+  // Make the calls in a loop.
+  for (i = 0; i < this->loop_count_; i++)
+    {
+      this->cube_union_dii ();
+    }
   timer.stop ();
 
-  timer.elapsed_time (elapsed_time);
-  elapsed_time.real_time *= ACE_ONE_SECOND_IN_MSECS;
-  elapsed_time.user_time *= ACE_ONE_SECOND_IN_MSECS;
-  elapsed_time.system_time *= ACE_ONE_SECOND_IN_MSECS;
-
-  ACE_DEBUG ((LM_DEBUG,
-	      "cube_union_dii() call:\n\treal_time\t= %0.06f ms, \n\t"
-	      "user_time\t= %0.06f ms, \n\t"
-	      "system_time\t= %0.06f ms\n",
-	      elapsed_time.real_time < 0.0? 0.0:elapsed_time.real_time,
-	      elapsed_time.user_time < 0.0? 0.0:elapsed_time.user_time,
-	      elapsed_time.system_time < 0.0? 0.0:elapsed_time.system_time));
+  timer.elapsed_time (elapsed_time);  
+  // compute call average call time.
+  this->print_stats ("cube_union_dii call", elapsed_time);
 
   if (this->exit_later_)
     {
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/clnt.h b/TAO/tests/Cubit/TAO/DII_Cubit/clnt.h
index 89575c53a0d..058e44283c5 100644
--- a/TAO/tests/Cubit/TAO/DII_Cubit/clnt.h
+++ b/TAO/tests/Cubit/TAO/DII_Cubit/clnt.h
@@ -62,6 +62,9 @@ private:
   int parse_args (void);
   // Parses the arguments passed on the command line.
 
+  void print_stats (const char *call_name, ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time);
+  // prints the time stats
+
   void cube_union_stub (void);
   // Exercise the union.  Cube a union.
   
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/clnt.cpp b/TAO/tests/Cubit/TAO/IDL_Cubit/clnt.cpp
index d1d5683c89b..d611650ec57 100644
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/clnt.cpp
+++ b/TAO/tests/Cubit/TAO/IDL_Cubit/clnt.cpp
@@ -449,6 +449,10 @@ Cubit_Client::print_stats (const char *call_name, ACE_Profile_Timer::ACE_Elapsed
 {
   double tmp;
 
+  ACE_DEBUG ((LM_DEBUG,
+	      "%s:\n",
+	      call_name));
+  
   if (this->call_count_ > 0  &&  this->error_count_ == 0)
     {
       tmp = 1000 / elapsed_time.real_time;
@@ -464,11 +468,10 @@ Cubit_Client::print_stats (const char *call_name, ACE_Profile_Timer::ACE_Elapsed
       tmp = 1000 / elapsed_time.real_time;
 
       ACE_DEBUG ((LM_DEBUG,
-		  "%s:\n\treal_time\t= %0.06f ms, \n\t"
+		  "\treal_time\t= %0.06f ms, \n\t"
 		  "user_time\t= %0.06f ms, \n\t"
 		  "system_time\t= %0.06f ms\n"
 		  "\t%0.00f calls/second\n",
-		  call_name,
 		  elapsed_time.real_time < 0.0? 0.0:elapsed_time.real_time,
 		  elapsed_time.user_time < 0.0? 0.0:elapsed_time.user_time,
 		  elapsed_time.system_time < 0.0? 0.0:elapsed_time.system_time,
@@ -476,7 +479,7 @@ Cubit_Client::print_stats (const char *call_name, ACE_Profile_Timer::ACE_Elapsed
     }
   else
     {
-      ACE_ERROR ((LM_ERROR, "No time stats printed.  Call count zero or error ocurred.\n"));
+      ACE_ERROR ((LM_ERROR, "\tNo time stats printed.\n\tCall count zero or error ocurred.\n"));
     }
 
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/clnt.h b/TAO/tests/Cubit/TAO/IDL_Cubit/clnt.h
index 389476c2c3d..77d61e6ae5e 100644
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/clnt.h
+++ b/TAO/tests/Cubit/TAO/IDL_Cubit/clnt.h
@@ -51,6 +51,7 @@ private:
   // Parses the arguments passed on the command line.
 
   void print_stats (const char *call_name, ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time);
+  // prints the time stats
 
   void cube_union_stub (void);
   // Exercise the union.  Cube a union.