Mon Jan 7 15:13:09 2002 Mayur Deshpande <mayur@ics.uci.edu>

4 files changed, 42 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 56e0b737e2f..13ebaaf58bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Mon Jan  7 15:13:09 2002  Mayur Deshpande  <mayur@ics.uci.edu>
+	* performance-tests/Misc/context_switch_time.cpp (main):
+	  Since the Yield_test does seem to work on VxWorks now (see 
+	  ChangeLog below), the 'ifdefs' for bypassing VxWorks for the
+	  Yield-Test have now been removed.
+
+Mon Jan  7 15:08:25 2002  Mayur Deshpande  <mayur@ics.uci.edu>
+
+	* ace/OS.i (thr_yield):
+	  Changed ::taskDelay (1) to ::taskDelay (0) for VxWorks in 
+	  thr_yield ().  The change with (0), now does seem to perform
+	  the yield correctly as reflected in the Yield-Test of 
+	  context_switch_time.
+
 Mon Jan  7 15:16:10 2002  Ossama Othman  <ossama@uci.edu>
 
 	* ace/OS.h (INADDR_NONE):
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 56e0b737e2f..13ebaaf58bc 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,17 @@
+Mon Jan  7 15:13:09 2002  Mayur Deshpande  <mayur@ics.uci.edu>
+	* performance-tests/Misc/context_switch_time.cpp (main):
+	  Since the Yield_test does seem to work on VxWorks now (see 
+	  ChangeLog below), the 'ifdefs' for bypassing VxWorks for the
+	  Yield-Test have now been removed.
+
+Mon Jan  7 15:08:25 2002  Mayur Deshpande  <mayur@ics.uci.edu>
+
+	* ace/OS.i (thr_yield):
+	  Changed ::taskDelay (1) to ::taskDelay (0) for VxWorks in 
+	  thr_yield ().  The change with (0), now does seem to perform
+	  the yield correctly as reflected in the Yield-Test of 
+	  context_switch_time.
+
 Mon Jan  7 15:16:10 2002  Ossama Othman  <ossama@uci.edu>
 
 	* ace/OS.h (INADDR_NONE):
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 56e0b737e2f..13ebaaf58bc 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,17 @@
+Mon Jan  7 15:13:09 2002  Mayur Deshpande  <mayur@ics.uci.edu>
+	* performance-tests/Misc/context_switch_time.cpp (main):
+	  Since the Yield_test does seem to work on VxWorks now (see 
+	  ChangeLog below), the 'ifdefs' for bypassing VxWorks for the
+	  Yield-Test have now been removed.
+
+Mon Jan  7 15:08:25 2002  Mayur Deshpande  <mayur@ics.uci.edu>
+
+	* ace/OS.i (thr_yield):
+	  Changed ::taskDelay (1) to ::taskDelay (0) for VxWorks in 
+	  thr_yield ().  The change with (0), now does seem to perform
+	  the yield correctly as reflected in the Yield-Test of 
+	  context_switch_time.
+
 Mon Jan  7 15:16:10 2002  Ossama Othman  <ossama@uci.edu>
 
 	* ace/OS.h (INADDR_NONE):
diff --git a/performance-tests/Misc/context_switch_time.cpp b/performance-tests/Misc/context_switch_time.cpp
index 44679a8c029..bdb1b4692d0 100644
--- a/performance-tests/Misc/context_switch_time.cpp
+++ b/performance-tests/Misc/context_switch_time.cpp
@@ -1252,7 +1252,6 @@ main (int argc, ACE_TCHAR *argv [])
             }
         }
 
-#if !defined (VXWORKS)
       // Then Yield test.
       Yield_Test yield_test (num_iterations);
       // Wait for all tasks to exit.
@@ -1268,7 +1267,6 @@ main (int argc, ACE_TCHAR *argv [])
                   (ACE_UINT32)
                     (yield_test.elapsed_time () % (num_iterations * 2u)) *
                       1000u / num_iterations / 2u));
-#endif /* ! VXWORKS */
 
       Synchronized_Suspend_Resume_Test
         synchronized_suspend_resume_test (num_iterations);
@@ -1296,10 +1294,8 @@ main (int argc, ACE_TCHAR *argv [])
       context_switch_test_stats.print_summary (3, num_iterations * 2u);
     }
 
-#if !defined (VXWORKS)
   ACE_OS::printf ("\nyield_test: ");
   yield_test_stats.print_summary (3, num_iterations * 2u);
-#endif /* ! VXWORKS */
 
   ACE_OS::printf ("\nsynchronized suspend-resume test: ");
   synchronized_suspend_resume_test_stats.print_summary (3,