ChangeLogTag: Wed Jan 5 11:29:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

26 files changed, 92 insertions, 289 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index cdef0ce67d7..30bb05c9b98 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,18 @@
+Wed Jan  5 11:29:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/SchedConfig_Scheduler.{h,cpp,i}:
+        * orbsvcs/orbsvcs/SchedReconfig_Sched_Utils.{h,cpp,i}:
+        * orbsvcs/orbsvcs/SchedReconfig_Sched_Utils_T.{h,cpp,i}:
+        * orbsvcs/orbsvcs/SchedReconfig_Scheduler.{h,cpp,i}:
+        * orbsvcs/orbsvcs/SchedReconfig_Scheduler_T.{h,cpp,i}:
+        * orbsvcs/orbsvcs/SchedScheduler.{h,cpp,i}:
+        * orbsvcs/orbsvcs/SchedScheduler_Generic.{h,cpp,i}:
+        * orbsvcs/orbsvcs/SchedStrategy_Scheduler.{h,cpp,i}:
+          Removed i file and updated h/cpp file.
+
+        * orbsvcs/orbsvcs/Makefile.am
+          Updated for changes above
+
 Wed Jan  5 11:21:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.{h,cpp,i}:
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
index 228b35423f1..3ff5ba53bb7 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Makefile.am
@@ -4528,16 +4528,8 @@ nobase_include_HEADERS += \
   RtecSchedulerS.inl \
   RtecSchedulerS_T.inl \
   Runtime_Scheduler.i \
-  Sched/Config_Scheduler.i \
   Sched/DynSched.i \
-  Sched/Reconfig_Sched_Utils.i \
-  Sched/Reconfig_Sched_Utils_T.i \
-  Sched/Reconfig_Scheduler.i \
-  Sched/Reconfig_Scheduler_T.i \
   Sched/SchedEntry.i \
-  Sched/Scheduler.i \
-  Sched/Scheduler_Generic.i \
-  Sched/Strategy_Scheduler.i \
   Scheduler_Factory.i \
   Scheduler_Utilities.i \
   RtecSchedulerS_T.cpp \
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index a1bd57f1ae8..b45536ee0cc 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -9,10 +9,6 @@
 
 #include "Config_Scheduler.h"
 
-#if defined (__ACE_INLINE__)
-#include "Config_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Sched, Config_Scheduler, "$Id$")
 
 ACE_Config_Scheduler::ACE_Config_Scheduler (void)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index abf9af35069..084a36a33f2 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -307,10 +307,6 @@ private:
 
 };
 
-#if defined (__ACE_INLINE__)
-#include "Config_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ACE_CONFIG_SCHEDULER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.i b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.i
deleted file mode 100644
index a21ea7f9897..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.i
+++ /dev/null
@@ -1,5 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
index f5e75f3118e..ffcbe5908fc 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
@@ -28,10 +28,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (__ACE_INLINE__)
-#include "Reconfig_Sched_Utils.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID (Sched, Reconfig_Sched_Utils, "$Id$")
 
 ///////////////////////////
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
index 225fa09960e..e0e814b5362 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
@@ -652,10 +652,6 @@ public:
   // on the operation characteristics of a representative scheduling entry.
 };
 
-#if defined (__ACE_INLINE__)
-#include "Reconfig_Sched_Utils.i"
-#endif /* __ACE_INLINE__ */
-
 // Include the templates here.
 #include "Reconfig_Sched_Utils_T.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.i b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.i
deleted file mode 100644
index 360e91cb420..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.i
+++ /dev/null
@@ -1,17 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Sched_Utils.i
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
-
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
index 6c64ca69c56..1b7dca516b3 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
@@ -26,10 +26,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if !defined (__ACE_INLINE__)
-#include "Reconfig_Sched_Utils_T.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Sched, Reconfig_Sched_Utils_T, "$Id$")
 
 ////////////////////////////////
@@ -58,7 +54,7 @@ visit (TAO_Reconfig_Scheduler_Entry &rse)
 {
   int result = 0;
 
-  /* WSOA merge - commented out 
+  /* WSOA merge - commented out
   // Call unconditional action method, which performs any necessary
   // modifications that are applied to each node unconditionally.
   if (this->unconditional_action (rse) < 0)
@@ -112,7 +108,7 @@ visit (TAO_Reconfig_Scheduler_Entry &rse)
               if (rt_info_map_.find ((*dependency_set) [i].rt_info,
                                      next_rt_info) != 0)
                 {
-                  ACE_ERROR_RETURN ((LM_ERROR, "RT_Info (%i) not found.\n", 
+                  ACE_ERROR_RETURN ((LM_ERROR, "RT_Info (%i) not found.\n",
                                      (*dependency_set) [i].rt_info), -1);
                 }
 
@@ -271,7 +267,7 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
 TAO_RSE_DFS_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 precondition (TAO_Reconfig_Scheduler_Entry &rse)
 {
-  int result = 
+  int result =
     TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
       precondition (rse);
 
@@ -411,7 +407,7 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
 TAO_RSE_SCC_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 precondition (TAO_Reconfig_Scheduler_Entry &rse)
 {
-  int result = 
+  int result =
     TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
       precondition (rse);
 
@@ -722,17 +718,17 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
                       "Failed to access tuple under iterator"));
           return -1;
         }
-      
+
       // @TODO - check for conjunction nodes here and perform conjunctive
       // function on existing rate tuples.
 
 #ifdef SCHEDULER_LOGGING
-      ACE_DEBUG((LM_DEBUG, "Inserting new propagated tuple for RT_Info: %d, entry_ptr: 0x%x, tuple_ptr: 0x%x\n", 
-                 successor.actual_rt_info ()->handle, 
+      ACE_DEBUG((LM_DEBUG, "Inserting new propagated tuple for RT_Info: %d, entry_ptr: 0x%x, tuple_ptr: 0x%x\n",
+                 successor.actual_rt_info ()->handle,
                  &successor,
                  (*tuple_ptr_ptr)));
 #endif
-      // Propagate tuples disjunctively. 
+      // Propagate tuples disjunctively.
       successor.insert_tuple (**tuple_ptr_ptr,
                               TAO_Reconfig_Scheduler_Entry::PROPAGATED);
 
@@ -755,18 +751,18 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
                       "Failed to access tuple under iterator"));
           return -1;
         }
-      
+
       // @TODO - check for conjunction nodes here and perform conjunctive
       // function on existing rate tuples.
 
 #ifdef SCHEDULER_LOGGING
-      ACE_DEBUG((LM_DEBUG, "Inserting new propagated tuple for RT_Info: %d, entry_ptr: 0x%x, tuple_ptr: 0x%x\n", 
-                 successor.actual_rt_info ()->handle, 
+      ACE_DEBUG((LM_DEBUG, "Inserting new propagated tuple for RT_Info: %d, entry_ptr: 0x%x, tuple_ptr: 0x%x\n",
+                 successor.actual_rt_info ()->handle,
                  &successor,
                  (*tuple_ptr_ptr)));
 #endif
 
-      // Propagate tuples disjunctively. 
+      // Propagate tuples disjunctively.
       successor.insert_tuple (**tuple_ptr_ptr,
                               TAO_Reconfig_Scheduler_Entry::PROPAGATED);
 
@@ -815,7 +811,7 @@ TAO_RSE_Priority_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::visit (TAO_Reconfig
 {
   int result = 0;
 #ifdef SCHEDULER_LOGGING
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "Priority_Visitor visiting %s[%d],crit=%d,period=%d\n",
               rse.actual_rt_info ()->entry_point.in(),
               rse.actual_rt_info ()->handle,
@@ -836,7 +832,7 @@ TAO_RSE_Priority_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::visit (TAO_Reconfig
   else
     {
 #ifdef SCHEDULER_LOGGING
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "Previous entry %s[%d],crit=%d,period=%d\n",
                   previous_entry_->actual_rt_info ()->entry_point.in(),
                   previous_entry_->actual_rt_info ()->handle,
@@ -922,7 +918,7 @@ TAO_Tuple_Admission_Visitor (const CORBA::Double & critical_utilization_threshol
   : critical_utilization_ (0.0),
     noncritical_utilization_ (0.0),
     total_critical_utilization_ (0.0),
-    total_noncritical_utilization_ (0.0),    
+    total_noncritical_utilization_ (0.0),
     critical_utilization_threshold_ (critical_utilization_threshold),
     noncritical_utilization_threshold_ (noncritical_utilization_threshold)
 {
@@ -945,13 +941,13 @@ TAO_Tuple_Admission_Visitor<RECONFIG_SCHED_STRATEGY>::visit (TAO_RT_Info_Tuple &
   if (t.enabled_state () == RtecScheduler::RT_INFO_DISABLED
       || entry->enabled_state () == RtecScheduler::RT_INFO_DISABLED)
     {
-      return 0; 
+      return 0;
     }
 
   // Compute the current tuple's utilization.
   CORBA::Double delta_utilization =
     (ACE_static_cast (CORBA::Double,
-                      t.threads) 
+                      t.threads)
      * ACE_static_cast (CORBA::Double,
                         ACE_UINT64_DBLCAST_ADAPTER (entry->
                                                       aggregate_exec_time ())))
@@ -1075,7 +1071,7 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
   ACE_UNUSED_ARG (di);
 
 #ifdef SCHEDULER_LOGGING
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "Crit Prop_Visitor visiting %s[%d], successor is %s[%d]\n",
               entry.actual_rt_info ()->entry_point.in(),
               entry.actual_rt_info ()->handle,
@@ -1085,19 +1081,19 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
 
   if (successor.enabled_state () != RtecScheduler::RT_INFO_DISABLED)
     {
-      RtecScheduler::Criticality_t entry_crit = 
+      RtecScheduler::Criticality_t entry_crit =
         entry.actual_rt_info ()->criticality;
-      RtecScheduler::Criticality_t succ_crit = 
+      RtecScheduler::Criticality_t succ_crit =
         successor.actual_rt_info ()->criticality;
       RtecScheduler::Criticality_t max_crit = entry_crit;
-      
+
       if (max_crit < succ_crit)
         max_crit = succ_crit;
 
       successor.actual_rt_info ()->criticality = max_crit;
 
 #ifdef SCHEDULER_LOGGING
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "Successor's new criticality is %d\n",
                   successor.actual_rt_info ()->criticality));
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
index e1d29a51d88..a63f3dba239 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
@@ -246,7 +246,7 @@ public:
     (ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
      ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
   // Constructor.
-  
+
 protected:
 
   virtual int pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
@@ -447,7 +447,7 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 class TAO_RSE_Criticality_Propagation_Visitor :
   public TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>
   // = TITLE
-  //   A scheduler entry visitor that propagates criticality 
+  //   A scheduler entry visitor that propagates criticality
   //   from called to calling nodes in a topologically ordered
   //   graph.
   //
@@ -473,12 +473,6 @@ protected:
 
 };
 
-
-#if defined (__ACE_INLINE__)
-#include "Reconfig_Sched_Utils_T.i"
-#endif /* __ACE_INLINE__ */
-
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "Reconfig_Sched_Utils_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.i b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.i
deleted file mode 100644
index 329f9c7c7ce..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.i
+++ /dev/null
@@ -1,16 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Sched_Utils_T.i
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp
index 13f8b3f5cf3..e8f3962e13c 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp
@@ -26,10 +26,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if !defined (__ACE_INLINE__)
-#include "Reconfig_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Sched, Reconfig_Scheduler, "$Id$")
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
index 4e46f2f8a63..ba2cdcb82dd 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
@@ -31,13 +31,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (__ACE_INLINE__)
-#include "Reconfig_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
 // Include the templates here.
 #include "Reconfig_Scheduler_T.h"
 
-
 #include /**/ "ace/post.h"
 #endif /* TAO_RECONFIG_SCHEDULER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.i b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.i
deleted file mode 100644
index c093d552760..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.i
+++ /dev/null
@@ -1,16 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Scheduler.i
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
index fd8d12992b6..dab2f3de771 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -26,11 +26,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if !defined (__ACE_INLINE__)
-#include "Reconfig_Scheduler_T.i"
-#endif /* __ACE_INLINE__ */
-
-//#ifdef _DEBUG 
+//#ifdef _DEBUG
 //#define SCHEDULER_LOGGING 1
 //#endif
 
@@ -194,12 +190,12 @@ init (int config_count,
   int result = 0;
   int i = 0;
 
-/* WSOA merge - commented out 
+/* WSOA merge - commented out
   // Clear out the previous entries, if any.
   this->close (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 */
-  
+
   // Re-map the RT_Info and dependency handle values if necessary.
   // Assumes that dependencies only refer to handles within the
   // current set: changing that assumption would require us to use
@@ -892,7 +888,7 @@ replace_seq (const RtecScheduler::RT_Info_Set& infos
             break;
 
             // Intentional fall-through to ignore non-volatile RT_Infos
-          case RtecScheduler::RT_INFO_NON_VOLATILE: 
+          case RtecScheduler::RT_INFO_NON_VOLATILE:
 
           default:                             // Ignore disabled RT_Infos.
             break;
@@ -1326,7 +1322,7 @@ recompute_scheduling (CORBA::Long minimum_priority,
   // If everything is already up to date, we're done.
   if (SCHED_ALL_STABLE == stability_flags_)
     {
-      
+
       // Must always provide a value for an out parameter
       ACE_NEW_THROW_EX (anomalies,
          RtecScheduler::Scheduling_Anomaly_Set (0),
@@ -1343,7 +1339,7 @@ recompute_scheduling (CORBA::Long minimum_priority,
     {
 
 #if defined (SCHEDULER_LOGGING)
-      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_, 
+      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
                                                     this->rt_info_count_,
                                                     "1_pre_crit_traverse.txt");
 #endif
@@ -1352,9 +1348,9 @@ recompute_scheduling (CORBA::Long minimum_priority,
       // topological ordering and identifying threads.
       crit_dfs_traverse_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
+
 #if defined (SCHEDULER_LOGGING)
-      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_, 
+      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
                                                     this->rt_info_count_,
                                                     "2_crit_dfs_traverse_i.txt");
 #endif
@@ -1362,25 +1358,25 @@ recompute_scheduling (CORBA::Long minimum_priority,
       // Propagate criticalities.
       propagate_criticalities_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
+
 #if defined (SCHEDULER_LOGGING)
-      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_, 
+      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
                                                     this->rt_info_count_,
                                                     "3_propagate_criticalities_i.txt");
 #endif
-      
+
 #if defined (SCHEDULER_LOGGING)
-      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_, 
+      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
                                                     this->rt_info_count_,
                                                     "4_pre_traverse.txt");
 #endif
-      
+
       // Traverse dependency graph, assigning a topological ordering and identifying threads.
       dfs_traverse_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
+
 #if defined (SCHEDULER_LOGGING)
-      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_, 
+      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
                                                     this->rt_info_count_,
                                                     "5_dfs_traverse_i.txt");
 #endif
@@ -1389,29 +1385,29 @@ recompute_scheduling (CORBA::Long minimum_priority,
       // for loops using the strongly connected components algorithm.
       detect_cycles_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
+
 #if defined (SCHEDULER_LOGGING)
-      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_, 
+      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
                                                     this->rt_info_count_,
-                                                    "6_detect_cycles_i.txt");                                              
+                                                    "6_detect_cycles_i.txt");
 #endif
-      
+
       // Perform admission control for task delineator rate tuples.
       perform_admission_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
+
 #if defined (SCHEDULER_LOGGING)
-      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_, 
+      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
                                                     this->rt_info_count_,
                                                     "7_perform_admission_i.txt");
 #endif
-      
+
       // Propagate effective execution time and period, set total frame size.
       propagate_characteristics_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
+
 #if defined (SCHEDULER_LOGGING)
-      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_, 
+      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
                                                     this->rt_info_count_,
                                                     "8_propagate_characteristics_i.txt");
 #endif
@@ -1425,13 +1421,13 @@ recompute_scheduling (CORBA::Long minimum_priority,
       // last feasible priority.
       assign_priorities_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
+
 #if defined (SCHEDULER_LOGGING)
-      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_, 
+      ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
                                                     this->rt_info_count_,
                                                     "9_assign_priorities_i.txt");
-#endif 
-      
+#endif
+
     }
 
   // @@ TODO: record any scheduling anomalies in a set within the scheduler,
@@ -1444,12 +1440,12 @@ recompute_scheduling (CORBA::Long minimum_priority,
       ACE_CHECK;
     }
 
-  ACE_DEBUG ((LM_DEBUG, 
-              "cutil = %f, ncutil = %f\n", 
+  ACE_DEBUG ((LM_DEBUG,
+              "cutil = %f, ncutil = %f\n",
               this->critical_utilization_,
               this->noncritical_utilization_));
 
-  if (this->critical_utilization_ > critical_utilization_threshold_ || 
+  if (this->critical_utilization_ > critical_utilization_threshold_ ||
       this->noncritical_utilization_ > noncritical_utilization_threshold_)
     {
       CORBA::ULong len = anomalies->length ();
@@ -1526,14 +1522,14 @@ get_dependency_set (RtecScheduler::Dependency_Set_out dependencies
          dependency_iter (this->called_dependency_set_map_);
        dependency_iter.done () == 0 && i < this->dependency_count_;
        ++dependency_iter)
-    {  
+    {
       dependency_set = (*dependency_iter).int_id_;
       for (u_int j = 0;
            j < dependency_set->length () && i < this->dependency_count_;
            ++i, ++j)
         {
           (* dependencies) [i] =  (*dependency_set) [j];
-          // For two-way calls, swap the handles (stored in reverse order in the called map) 
+          // For two-way calls, swap the handles (stored in reverse order in the called map)
           if ((* dependencies) [i].dependency_type == RtecBase::TWO_WAY_CALL)
             {
               (* dependencies) [i].rt_info =  (* dependency_set) [j].rt_info_depended_on;
@@ -1816,7 +1812,7 @@ create_i (const char *entry_point,
   new_sched_entry_ptr.release ();
 
   // Connect the entry to the RT_Info.
-  new_rt_info->volatile_token = 
+  new_rt_info->volatile_token =
     ACE_static_cast (CORBA::ULongLong,
                      ACE_reinterpret_cast (ptrdiff_t,
                                            new_sched_entry));
@@ -1904,12 +1900,12 @@ set_i (TAO_RT_Info_Ex *rt_info,
                             CORBA::NO_MEMORY ());
           ACE_CHECK;
 
-          
+
           // Make sure the new tuple is cleaned up if we exit abruptly.
           auto_ptr<TAO_RT_Info_Tuple> tuple_auto_ptr (tuple_ptr);
-  
-//          ACE_DEBUG((LM_DEBUG, "Tuple not found.  Inserting new tuple for RT_Info: %d, entry_ptr: 0x%x, tuple_ptr: 0x%x\n", 
-//                     rt_info->handle, 
+
+//          ACE_DEBUG((LM_DEBUG, "Tuple not found.  Inserting new tuple for RT_Info: %d, entry_ptr: 0x%x, tuple_ptr: 0x%x\n",
+//                     rt_info->handle,
 //                     rse_ptr,
 //                     tuple_ptr));
           // Add the tuple to the entry's original tuple set
@@ -2049,7 +2045,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                         enabled
                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       break;
 
     // In a one-way call, the called operation depends on the
@@ -2083,16 +2079,16 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
       ACE_THROW (RtecScheduler::INTERNAL ());
   }
 
- // Add the criticality dependency map entry. 
+ // Add the criticality dependency map entry.
  // If A---TW--->B and C---OW--->D, the add_dependency_calls
  // would look like this
  // add_dependency (A, B, TW)
  // add_dependency (D, C, OW)
  // Neither of the other two maps capture these dependencies
  // A depends on B and D depends on C.
- // The calling dependency map captures 
+ // The calling dependency map captures
  // A calls B and C calls D.
- // The called dependency map captures 
+ // The called dependency map captures
  // B called by A and D called by C.
 
  map_dependency_i (handle,                    // calling handle
@@ -2285,7 +2281,7 @@ map_dependency_i (RtecScheduler::handle_t key,
                   ACE_TYPENAME TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map,
                   CORBA::Long number_of_calls,
                   RtecScheduler::Dependency_Type_t dependency_type,
-                  RtecScheduler::Dependency_Enabled_Type_t enabled                  
+                  RtecScheduler::Dependency_Enabled_Type_t enabled
                   ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
@@ -2348,7 +2344,7 @@ unmap_dependency_i (RtecScheduler::handle_t key,
   RtecScheduler::Dependency_Set *dependency_set = 0;
 
   // Try to unbind the matching dependency set from the passed map
-  // and if successful, destroy the 
+  // and if successful, destroy the
   if (dependency_map.find (key, dependency_set) == 0)
     {
       if (dependency_set)
@@ -2379,7 +2375,7 @@ unmap_dependency_i (RtecScheduler::handle_t key,
           if (!found)
             {
               ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
-            } 
+            }
         }
       else
         {
@@ -2418,7 +2414,7 @@ map_dependency_enable_state_i (RtecScheduler::handle_t key,
   RtecScheduler::Dependency_Set *dependency_set = 0;
 
   // Try to unbind the matching dependency set from the passed map
-  // and if successful, destroy the 
+  // and if successful, destroy the
   if (dependency_map.find (key, dependency_set) == 0)
     {
       if (dependency_set)
@@ -2586,7 +2582,7 @@ perform_admission_i (ACE_ENV_SINGLE_ARG_DECL)
   // Traverse tuples in admission order, updating the associate tuple
   // for each thread delineator.
 #if defined (SCHEDULER_LOGGING)
-  ACE_Scheduler_Factory::log_scheduling_tuples(tuple_ptr_array_, 
+  ACE_Scheduler_Factory::log_scheduling_tuples(tuple_ptr_array_,
                                                this->rt_info_tuple_count_,
                                                "sorted_admit_tuples.txt");
 #endif
@@ -2750,7 +2746,7 @@ assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG, "Scheduler::entry ptr array before sorting is\n"));
   for (i = 0; i < this->rt_info_count_; ++i)
     {
-      RtecScheduler::RT_Info* rt_info_ptr = 
+      RtecScheduler::RT_Info* rt_info_ptr =
         this->entry_ptr_array_[i]->actual_rt_info ();
       ACE_DEBUG ((LM_DEBUG,
                   " %s [%d] crit=%d,prio=%d,preemption_prio=%d,subprio=%d\n ",
@@ -2759,7 +2755,7 @@ assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL)
                   rt_info_ptr->criticality,
                   rt_info_ptr->priority,
                   rt_info_ptr->preemption_priority,
-                  rt_info_ptr->preemption_subpriority));                  
+                  rt_info_ptr->preemption_subpriority));
     }
 #endif /* SCHEDULER_LOGGING */
 
@@ -2776,7 +2772,7 @@ assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG, "Scheduler::qsorted array is\n"));
   for (i = 0; i < this->rt_info_count_; ++i)
     {
-      RtecScheduler::RT_Info* rt_info_ptr = 
+      RtecScheduler::RT_Info* rt_info_ptr =
         this->entry_ptr_array_[i]->actual_rt_info ();
       ACE_DEBUG ((LM_DEBUG,
                   " %s [%d] crit=%d,prio=%d,preemption_prio=%d,subprio=%d\n ",
@@ -2785,7 +2781,7 @@ assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL)
                   rt_info_ptr->criticality,
                   rt_info_ptr->priority,
                   rt_info_ptr->preemption_priority,
-                  rt_info_ptr->preemption_subpriority));                  
+                  rt_info_ptr->preemption_subpriority));
     }
 #endif
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
index c44f43abe39..c8b82223a21 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
@@ -759,11 +759,6 @@ maintain_scheduling_array (ARRAY_ELEMENT_TYPE ** & current_ptr_array,
 // arrays.  This function expands the array eagerly, to minimize time
 // overhead for memory allocation (at a cost of some unused space).
 
-#if defined (__ACE_INLINE__)
-#include "Reconfig_Scheduler_T.i"
-#endif /* __ACE_INLINE__ */
-
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "Reconfig_Scheduler_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.i b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.i
deleted file mode 100644
index cf7d8543e8e..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.i
+++ /dev/null
@@ -1,16 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Scheduler_T.i
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
index 9619eceb420..447c70230aa 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
@@ -21,10 +21,6 @@
 #include "Scheduler.h"
 #include "ace/OS_NS_stdio.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
 #include "ace/Lock_Adapter_T.h"
 
 ACE_RCSID(Sched, Scheduler, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
index abb37fc6cee..9400ba0ac67 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
@@ -293,10 +293,6 @@ private:
 
 typedef ACE_Scheduler Scheduler;
 
-#if defined (__ACE_INLINE__)
-#include "Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* SCHEDULER_H */
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.i b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.i
deleted file mode 100644
index 57875ae26d1..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.i
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler.i
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
-
-// EOF
-
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
index f3a3877c13e..b6cfd9c042e 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
@@ -21,10 +21,6 @@
 #include "Scheduler_Generic.h"
 #include "ace/OS_NS_stdio.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Scheduler_Generic.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(Sched, Scheduler_Generic, "$Id$")
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
index 7c039ca4002..5cfbf7b88d5 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
@@ -130,13 +130,7 @@ private:
     const Scheduler_Generic &))
 };
 
-
-#if defined (__ACE_INLINE__)
-#include "Scheduler_Generic.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* SCHEDULER_INTERNAL_H */
 
-
 // EOF
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.i b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.i
deleted file mode 100644
index 71e3695dc35..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.i
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler_Generic.i
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
-
-
-// EOF
-
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
index bc42c024c84..6192a59802a 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
@@ -19,12 +19,8 @@
 #include "Strategy_Scheduler.h"
 #include "ace/Sched_Params.h"
 
-#if ! defined (__ACE_INLINE__)
-#include "Strategy_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Sched, 
-           Strategy_Scheduler, 
+ACE_RCSID (Sched,
+           Strategy_Scheduler,
            "$Id$")
 
 //////////////////////////////////////////////
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
index a31314b3fb7..2abc6e1fb05 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
@@ -491,12 +491,6 @@ private:
 
 };
 
-
-
-#if defined (__ACE_INLINE__)
-#include "Strategy_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* STRATEGY_SCHEDULER_H */
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.i b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.i
deleted file mode 100644
index c84e9e2da77..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.i
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Strategy_Scheduler.i
-//
-// = CREATION DATE
-//    22 December 1997
-//
-// = AUTHOR
-//    Chris Gill
-//
-// ============================================================================
-
-
-// EOF
-