ChangeLogTag: Sun Mar 6 02:03:25 2005 Tao Lu <lu@dre.vanderbilt.edu>

14 files changed, 88 insertions, 56 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 8828b4ec324..68de40ef3d0 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,21 @@
+Sun Mar  6 02:03:25 2005  Tao Lu  <lu@dre.vanderbilt.edu>
+
+	* examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp:
+	* examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp:
+	* examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp:
+	* examples/RTScheduling/Job_i.cpp:
+	* examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp:
+	* examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp:
+	* tao/Leader_Follower.cpp:
+	* tao/LocateRequest_Invocation.cpp:
+	* tao/Profile_Transport_Resolver.cpp:
+	* tao/Synch_Invocation.cpp:
+	* tao/Wait_On_Reactor.cpp:
+	* tao/Wait_On_Read.cpp:
+	* tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp:
+	Added proper include for Countdown_Time.h
+
+
 Sat Mar 05 11:58:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Bug_1495_Regression/test.idl:
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
index a28658d96d1..489c64602a1 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
@@ -5,6 +5,7 @@
 #include "ace/Task.h"
 #include "ace/ACE.h"
 #include "tao/debug.h"
+#include "ace/Countdown_Time.h"
 
 #if !defined(__ACE_INLINE__)
 #include "test_i.i"
@@ -46,7 +47,7 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
 			-1);
     }
 
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "Request in thread %t, prio = %d,"
               "exec duration = %u\n", prio, exec_duration));
 
@@ -61,7 +62,7 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
 
   ACE_Time_Value yield_count_down_time (yield_interval);
   ACE_Countdown_Time yield_count_down (&yield_count_down_time);
-  
+
   timer.start ();
   int j=0;
   while (compute_count_down_time > ACE_Time_Value::zero)
@@ -69,14 +70,14 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
       ACE::is_prime (prime_number,
 		     2,
 		     prime_number / 2);
-      
+
       ++j;
 
 #ifdef KOKYU_DSRT_LOGGING
-      if (j%1000 == 0) 
+      if (j%1000 == 0)
         {
-          ACE_DEBUG ((LM_DEBUG, 
-            "(%t|%T) loop # = %d, load = %usec\n", j, exec_duration)); 
+          ACE_DEBUG ((LM_DEBUG,
+            "(%t|%T) loop # = %d, load = %usec\n", j, exec_duration));
         }
 #endif
       if (j%1000 == 0)
@@ -84,7 +85,7 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
           ACE_Time_Value run_time = ACE_OS::gettimeofday ();
           task_stats_.sample (ACE_UINT32 (run_time.msec ()), guid);
         }
-      
+
       compute_count_down.update ();
 
       if (enable_yield_)
@@ -92,12 +93,12 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
           yield_count_down.update ();
           if (yield_count_down_time <= ACE_Time_Value::zero)
             {
-              CORBA::Policy_var sched_param_policy = 
+              CORBA::Policy_var sched_param_policy =
                 CORBA::Policy::_duplicate (current_->
                                            scheduling_parameter(ACE_ENV_SINGLE_ARG_PARAMETER));
-              
+
               const char * name = 0;
-              
+
               CORBA::Policy_ptr implicit_sched_param = 0;
               current_->update_scheduling_segment (name,
                                                    sched_param_policy.in (),
@@ -111,12 +112,12 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
 
   timer.stop ();
   timer.elapsed_time (elapsed_time);
-  
-  ACE_DEBUG ((LM_DEBUG, 
+
+  ACE_DEBUG ((LM_DEBUG,
 	      "Request processing in thread %t done, "
-	      "prio = %d, load = %d, elapsed time = %umsec\n", 
+	      "prio = %d, load = %d, elapsed time = %umsec\n",
 	      prio, exec_duration, elapsed_time.msec () ));
-  
+
   return exec_duration;
 }
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
index 0f6874449e4..60f18f3b9f5 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
@@ -5,6 +5,7 @@
 #include "ace/Task.h"
 #include "ace/ACE.h"
 #include "tao/debug.h"
+#include "ace/Countdown_Time.h"
 
 #if !defined(__ACE_INLINE__)
 #include "test_i.i"
@@ -46,7 +47,7 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
 			-1);
     }
 
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "Request in thread %t, prio = %d,"
               "exec duration = %u\n", prio, exec_duration));
 
@@ -61,7 +62,7 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
 
   ACE_Time_Value yield_count_down_time (yield_interval);
   ACE_Countdown_Time yield_count_down (&yield_count_down_time);
-  
+
   timer.start ();
   int j=0;
   while (compute_count_down_time > ACE_Time_Value::zero)
@@ -69,14 +70,14 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
       ACE::is_prime (prime_number,
 		     2,
 		     prime_number / 2);
-      
+
       ++j;
 
 #ifdef KOKYU_DSRT_LOGGING
-      if (j%1000 == 0) 
+      if (j%1000 == 0)
         {
-          ACE_DEBUG ((LM_DEBUG, 
-            "(%t|%T) loop # = %d, load = %usec\n", j, exec_duration)); 
+          ACE_DEBUG ((LM_DEBUG,
+            "(%t|%T) loop # = %d, load = %usec\n", j, exec_duration));
         }
 #endif
       if (j%1000 == 0)
@@ -84,7 +85,7 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
           ACE_Time_Value run_time = ACE_OS::gettimeofday ();
           task_stats_.sample (run_time.msec (), guid);
         }
-      
+
       compute_count_down.update ();
 
       if (enable_yield_)
@@ -92,12 +93,12 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
           yield_count_down.update ();
           if (yield_count_down_time <= ACE_Time_Value::zero)
             {
-              CORBA::Policy_var sched_param_policy = 
+              CORBA::Policy_var sched_param_policy =
                 CORBA::Policy::_duplicate (current_->
                                            scheduling_parameter(ACE_ENV_SINGLE_ARG_PARAMETER));
-              
+
               const char * name = 0;
-              
+
               CORBA::Policy_ptr implicit_sched_param = 0;
               current_->update_scheduling_segment (name,
                                                    sched_param_policy.in (),
@@ -111,12 +112,12 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
 
   timer.stop ();
   timer.elapsed_time (elapsed_time);
-  
-  ACE_DEBUG ((LM_DEBUG, 
+
+  ACE_DEBUG ((LM_DEBUG,
 	      "Request processing in thread %t done, "
-	      "prio = %d, load = %d, elapsed time = %umsec\n", 
+	      "prio = %d, load = %d, elapsed time = %umsec\n",
 	      prio, exec_duration, elapsed_time.msec () ));
-  
+
   return exec_duration;
 }
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
index 0f6874449e4..60f18f3b9f5 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
@@ -5,6 +5,7 @@
 #include "ace/Task.h"
 #include "ace/ACE.h"
 #include "tao/debug.h"
+#include "ace/Countdown_Time.h"
 
 #if !defined(__ACE_INLINE__)
 #include "test_i.i"
@@ -46,7 +47,7 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
 			-1);
     }
 
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "Request in thread %t, prio = %d,"
               "exec duration = %u\n", prio, exec_duration));
 
@@ -61,7 +62,7 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
 
   ACE_Time_Value yield_count_down_time (yield_interval);
   ACE_Countdown_Time yield_count_down (&yield_count_down_time);
-  
+
   timer.start ();
   int j=0;
   while (compute_count_down_time > ACE_Time_Value::zero)
@@ -69,14 +70,14 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
       ACE::is_prime (prime_number,
 		     2,
 		     prime_number / 2);
-      
+
       ++j;
 
 #ifdef KOKYU_DSRT_LOGGING
-      if (j%1000 == 0) 
+      if (j%1000 == 0)
         {
-          ACE_DEBUG ((LM_DEBUG, 
-            "(%t|%T) loop # = %d, load = %usec\n", j, exec_duration)); 
+          ACE_DEBUG ((LM_DEBUG,
+            "(%t|%T) loop # = %d, load = %usec\n", j, exec_duration));
         }
 #endif
       if (j%1000 == 0)
@@ -84,7 +85,7 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
           ACE_Time_Value run_time = ACE_OS::gettimeofday ();
           task_stats_.sample (run_time.msec (), guid);
         }
-      
+
       compute_count_down.update ();
 
       if (enable_yield_)
@@ -92,12 +93,12 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
           yield_count_down.update ();
           if (yield_count_down_time <= ACE_Time_Value::zero)
             {
-              CORBA::Policy_var sched_param_policy = 
+              CORBA::Policy_var sched_param_policy =
                 CORBA::Policy::_duplicate (current_->
                                            scheduling_parameter(ACE_ENV_SINGLE_ARG_PARAMETER));
-              
+
               const char * name = 0;
-              
+
               CORBA::Policy_ptr implicit_sched_param = 0;
               current_->update_scheduling_segment (name,
                                                    sched_param_policy.in (),
@@ -111,12 +112,12 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
 
   timer.stop ();
   timer.elapsed_time (elapsed_time);
-  
-  ACE_DEBUG ((LM_DEBUG, 
+
+  ACE_DEBUG ((LM_DEBUG,
 	      "Request processing in thread %t done, "
-	      "prio = %d, load = %d, elapsed time = %umsec\n", 
+	      "prio = %d, load = %d, elapsed time = %umsec\n",
 	      prio, exec_duration, elapsed_time.msec () ));
-  
+
   return exec_duration;
 }
 
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp
index a42c951386e..6f78d4353bd 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp
@@ -5,7 +5,7 @@
 #include "tao/RTCORBA/Priority_Mapping.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/OS_NS_errno.h"
-
+#include "ace/Countdown_Time.h"
 
 FP_Task::FP_Task (int importance,
 		  int start_time,
@@ -36,21 +36,21 @@ FP_Task::activate_task (RTScheduling::Current_ptr current,
     ACE_DEBUG ((LM_DEBUG,
 		"Thread_Task::activate %d\n",
 		importance_));
-  
+
   char msg [BUFSIZ];
   ACE_OS::sprintf (msg, "Thread_Task::activate task\n");
   dt_creator_->log_msg (msg);
-   
+
   base_time_ = base_time;
 
   current_ = RTScheduling::Current::_narrow (current
-					     ACE_ENV_ARG_PARAMETER);	
+					     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   sched_param_ = CORBA::Policy::_duplicate (sched_param);
 
   pre_activate ();
-  
+
   if (this->activate (flags,
 		      1,
 		      0,
diff --git a/TAO/examples/RTScheduling/Job_i.cpp b/TAO/examples/RTScheduling/Job_i.cpp
index 90aa0376198..16423ea1257 100644
--- a/TAO/examples/RTScheduling/Job_i.cpp
+++ b/TAO/examples/RTScheduling/Job_i.cpp
@@ -7,6 +7,7 @@
 #include "Task_Stats.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/OS_NS_sys_time.h"
+#include "ace/Countdown_Time.h"
 
 Job_i::Job_i (DT_Creator* dt_creator)
   : dt_creator_ (dt_creator),
@@ -54,7 +55,7 @@ Job_i::work (CORBA::ULong work,
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   static CORBA::ULong prime_number = 9619;
-  
+
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
 		"test_i::method: %d units of work\n",
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
index 265b607b56b..3ed21224896 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
@@ -2,6 +2,7 @@
 #include "MIF_Task.h"
 #include "test.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/Countdown_Time.h"
 
 MIF_Task::MIF_Task (int importance,
 		    int start_time,
@@ -49,20 +50,20 @@ MIF_Task::activate_task (RTScheduling::Current_ptr current,
 			 ACE_Time_Value* base_time
 			 ACE_ENV_ARG_DECL)
 {
-  
+
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
 		"Thread_Task::activate %d\n",
 		importance_));
-  
+
   char msg [BUFSIZ];
   ACE_OS::sprintf (msg, "Thread_Task::activate task\n");
   dt_creator_->log_msg (msg);
-   
+
   base_time_ = base_time;
 
   current_ = RTScheduling::Current::_narrow (current
-					     ACE_ENV_ARG_PARAMETER);	
+					     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   sched_param_ = CORBA::Policy::_duplicate (sched_param);
@@ -77,7 +78,7 @@ MIF_Task::activate_task (RTScheduling::Current_ptr current,
 			   ACE_TEXT ("Insufficient privilege to run this test.\n")),
 			  -1);
     }
-  
+
   post_activate ();
   return 0;
 }
@@ -87,7 +88,7 @@ MIF_Task::perform_task (void)
 {
   ACE_TRY_NEW_ENV
     {
-      
+
       char msg [BUFSIZ];
       ACE_OS::sprintf (msg, "MIF_Task::perform_task %d\n", count_);
       dt_creator_->log_msg (msg);
@@ -161,7 +162,7 @@ MIF_Task::perform_task (void)
       return -1;
     }
   ACE_ENDTRY;
-  
+
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
 		"Thread %d\n",
diff --git a/TAO/tao/Leader_Follower.cpp b/TAO/tao/Leader_Follower.cpp
index cf05375db8a..dc1eb0a25c7 100644
--- a/TAO/tao/Leader_Follower.cpp
+++ b/TAO/tao/Leader_Follower.cpp
@@ -7,7 +7,7 @@
 #include "tao/debug.h"
 #include "tao/Transport.h"
 #include "tao/GUIResource_Factory.h"
-#include "ace/OS_NS_sys_time.h"
+#include "ace/Countdown_Time.h"
 
 #include "ace/Reactor.h"
 
diff --git a/TAO/tao/LocateRequest_Invocation.cpp b/TAO/tao/LocateRequest_Invocation.cpp
index 0c4e686ec24..940f8347bc8 100644
--- a/TAO/tao/LocateRequest_Invocation.cpp
+++ b/TAO/tao/LocateRequest_Invocation.cpp
@@ -9,6 +9,8 @@
 #include "Profile.h"
 #include "ORB_Constants.h"
 
+#include "ace/Countdown_Time.h"
+
 ACE_RCSID (tao,
            LocateRequest_Invocation,
            "$Id$")
diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp
index 42a79a32eb5..0fab758b90c 100644
--- a/TAO/tao/Profile_Transport_Resolver.cpp
+++ b/TAO/tao/Profile_Transport_Resolver.cpp
@@ -13,6 +13,8 @@
 #include "Endpoint.h"
 #include "SystemException.h"
 
+#include "ace/Countdown_Time.h"
+
 #if !defined (__ACE_INLINE__)
 # include "Profile_Transport_Resolver.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index fef4a9676e6..9837659a035 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -17,6 +17,7 @@
 
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Countdown_Time.h"
 
 #if !defined (__ACE_INLINE__)
 # include "Synch_Invocation.inl"
diff --git a/TAO/tao/Wait_On_Reactor.cpp b/TAO/tao/Wait_On_Reactor.cpp
index deba786785b..9168df03344 100644
--- a/TAO/tao/Wait_On_Reactor.cpp
+++ b/TAO/tao/Wait_On_Reactor.cpp
@@ -6,6 +6,7 @@
 #include "tao/Synch_Reply_Dispatcher.h"
 
 #include "ace/Reactor.h"
+#include "ace/Countdown_Time.h"
 
 ACE_RCSID (tao,
            Wait_On_Reactor,
diff --git a/TAO/tao/Wait_On_Read.cpp b/TAO/tao/Wait_On_Read.cpp
index 6d5ae896527..01dc3c8a4d0 100644
--- a/TAO/tao/Wait_On_Read.cpp
+++ b/TAO/tao/Wait_On_Read.cpp
@@ -5,6 +5,8 @@
 #include "tao/Resume_Handle.h"
 #include "tao/Synch_Reply_Dispatcher.h"
 
+#include "ace/Countdown_Time.h"
+
 ACE_RCSID (tao,
            Wait_On_Read,
            "$Id$")
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
index cd59317c2a7..972265b77f7 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
@@ -3,6 +3,7 @@
 #include "test_i.h"
 #include "tao/ORB_Core.h"
 #include "tao/RTCORBA/Thread_Pool.h"
+#include "ace/Countdown_Time.h"
 
 ACE_RCSID(Priority_Inversion_With_Bands, test_i, "$Id$")