Wed Feb 24 08:01:54 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * tests/NonBlocking_Conn_Test.cpp:
          Unicode fixes

        * tests/Atomic_Op_Test.cpp:
          Calculate how long each test takes and print this to the log

3 files changed, 95 insertions, 24 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 8fa8a04ec4e..f7cc47aa369 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,6 +1,14 @@
+Wed Feb 24 08:01:54 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/NonBlocking_Conn_Test.cpp:
+          Unicode fixes
+
+        * tests/Atomic_Op_Test.cpp:
+          Calculate how long each test takes and print this to the log
+
 Wed Feb 24 02:48:37 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        * ace/config-sunos5.5.h: 
+        * ace/config-sunos5.5.h:
           #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL
 
 Tue Feb 23 19:45:39 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
diff --git a/ACE/tests/Atomic_Op_Test.cpp b/ACE/tests/Atomic_Op_Test.cpp
index d807b287684..00dfc06c8af 100644
--- a/ACE/tests/Atomic_Op_Test.cpp
+++ b/ACE/tests/Atomic_Op_Test.cpp
@@ -25,6 +25,8 @@ ACE_RCSID(tests, Atomic_Op_Test, "$Id$")
 
 #include "ace/Atomic_Op.h"
 #include "ace/Synch_Traits.h"
+#include "ace/Time_Value.h"
+#include "ace/OS_NS_sys_time.h"
 
 enum { TEST_ITERATIONS = 1000000 };
 
@@ -69,7 +71,10 @@ run_main (int, ACE_TCHAR *[])
   ACE_ASSERT (foo == 7);
   ACE_ASSERT (foo2 == 7);
 
+  ACE_UINT64 usec;
+
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <long> assignment %D\n")));
+  ACE_Time_Value diff = ACE_OS::gettimeofday ();
   int i;
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
@@ -78,9 +83,12 @@ run_main (int, ACE_TCHAR *[])
       foo = 3;
       foo = 4;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> assignment %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> assignment %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <long> increment %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       ++foo;
@@ -88,9 +96,12 @@ run_main (int, ACE_TCHAR *[])
       ++foo;
       ++foo;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> increment %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> increment %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <long> decrement %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       --foo;
@@ -98,9 +109,12 @@ run_main (int, ACE_TCHAR *[])
       --foo;
       --foo;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> decrement %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> decrement %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <long> addition %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       foo += 5;
@@ -108,9 +122,12 @@ run_main (int, ACE_TCHAR *[])
       foo += 5;
       foo += 5;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> addition %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> addition %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <long> subtraction %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       foo -= 5;
@@ -118,7 +135,9 @@ run_main (int, ACE_TCHAR *[])
       foo -= 5;
       foo -= 5;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> subtraction %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> subtraction %D, took %Q\n"), usec));
 
   ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned long> foo_unsigned (5);
 
@@ -157,6 +176,7 @@ run_main (int, ACE_TCHAR *[])
   ACE_ASSERT (foo_unsigned2 == 7);
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned long> assignment %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       foo_unsigned = 1;
@@ -164,9 +184,12 @@ run_main (int, ACE_TCHAR *[])
       foo_unsigned = 3;
       foo_unsigned = 4;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> assignment %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> assignment %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned long> increment %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       ++foo_unsigned;
@@ -174,9 +197,12 @@ run_main (int, ACE_TCHAR *[])
       ++foo_unsigned;
       ++foo_unsigned;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> increment %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> increment %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned long> decrement %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       --foo_unsigned;
@@ -184,9 +210,12 @@ run_main (int, ACE_TCHAR *[])
       --foo_unsigned;
       --foo_unsigned;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> decrement %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> decrement %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned long> addition %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       foo_unsigned += 5;
@@ -194,9 +223,12 @@ run_main (int, ACE_TCHAR *[])
       foo_unsigned += 5;
       foo_unsigned += 5;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> addition %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> addition %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned long> subtraction %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       foo_unsigned -= 5;
@@ -204,7 +236,9 @@ run_main (int, ACE_TCHAR *[])
       foo_unsigned -= 5;
       foo_unsigned -= 5;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> subtraction %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> subtraction %D, took %Q\n"), usec));
 
   ACE_Atomic_Op <ACE_SYNCH_MUTEX, int> bar (5);
 
@@ -243,6 +277,7 @@ run_main (int, ACE_TCHAR *[])
   ACE_ASSERT (bar2 == 7);
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <int> assignment %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       bar = 1;
@@ -250,9 +285,12 @@ run_main (int, ACE_TCHAR *[])
       bar = 3;
       bar = 4;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> assignment %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> assignment %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <int> increment %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       ++bar;
@@ -260,9 +298,12 @@ run_main (int, ACE_TCHAR *[])
       ++bar;
       ++bar;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> increment %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> increment %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <int> decrement %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       --bar;
@@ -270,9 +311,12 @@ run_main (int, ACE_TCHAR *[])
       --bar;
       --bar;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> decrement %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> decrement %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <int> addition %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       bar += 5;
@@ -280,9 +324,12 @@ run_main (int, ACE_TCHAR *[])
       bar += 5;
       bar += 5;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> addition %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> addition %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <int> subtraction %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       bar -= 5;
@@ -290,7 +337,9 @@ run_main (int, ACE_TCHAR *[])
       bar -= 5;
       bar -= 5;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> subtraction %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> subtraction %D, took %Q\n"), usec));
 
   ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned int> unsigned_bar (5);
 
@@ -329,6 +378,7 @@ run_main (int, ACE_TCHAR *[])
   ACE_ASSERT (unsigned_bar2 == 7);
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned int> assignment %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       unsigned_bar = 1;
@@ -336,9 +386,12 @@ run_main (int, ACE_TCHAR *[])
       unsigned_bar = 3;
       unsigned_bar = 4;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> assignment %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> assignment %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned int> increment %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       ++unsigned_bar;
@@ -346,9 +399,12 @@ run_main (int, ACE_TCHAR *[])
       ++unsigned_bar;
       ++unsigned_bar;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> increment %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> increment %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned int> decrement %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       --unsigned_bar;
@@ -356,9 +412,12 @@ run_main (int, ACE_TCHAR *[])
       --unsigned_bar;
       --unsigned_bar;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> decrement %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> decrement %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned int> addition %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       unsigned_bar += 5;
@@ -366,9 +425,12 @@ run_main (int, ACE_TCHAR *[])
       unsigned_bar += 5;
       unsigned_bar += 5;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> addition %D\n")));
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> addition %D, took %Q\n"), usec));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned int> subtraction %D\n")));
+  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       unsigned_bar -= 5;
@@ -376,8 +438,9 @@ run_main (int, ACE_TCHAR *[])
       unsigned_bar -= 5;
       unsigned_bar -= 5;
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> subtraction %D\n")));
-
+  diff = ACE_OS::gettimeofday () - diff;
+  diff.to_usec (usec);
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> subtraction %D, took %Q\n"), usec));
 
   ACE_END_TEST;
   return 0;
diff --git a/ACE/tests/NonBlocking_Conn_Test.cpp b/ACE/tests/NonBlocking_Conn_Test.cpp
index e1501dd5a8f..4eba44f07b0 100644
--- a/ACE/tests/NonBlocking_Conn_Test.cpp
+++ b/ACE/tests/NonBlocking_Conn_Test.cpp
@@ -159,10 +159,10 @@ test_connect (ACE_Reactor &reactor,
                                    1);
 
       ACE_DEBUG ((LM_DEBUG,
-                  "Connection to %s %s\n",
+                  ACE_TEXT ("Connection to %s %s\n"),
                   buffer,
                   connection_status[i] == Svc_Handler::Conn_SUCCEEDED ?
-                  "succeeded" : "failed"));
+                  ACE_TEXT("succeeded") : ACE_TEXT("failed")));
 
       if (connection_status[i] == Svc_Handler::Conn_SUCCEEDED)
         {