Simplified Direct priority mapping.

17 files changed, 135 insertions, 155 deletions

diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
index 2aa132a855f..1e7d75265d1 100644
--- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
@@ -11,11 +11,8 @@
 
 ACE_RCSID(Strategies, Direct_Priority_Mapping, "$Id$")
 
-TAO_Direct_Priority_Mapping::TAO_Direct_Priority_Mapping (long policy)
-  : policy_ (policy)
+TAO_Direct_Priority_Mapping::TAO_Direct_Priority_Mapping (long)
 {
-  this->min_ = ACE_Sched_Params::priority_min (this->policy_);
-  this->max_ = ACE_Sched_Params::priority_max (this->policy_);
 }
 
 TAO_Direct_Priority_Mapping::~TAO_Direct_Priority_Mapping (void)
@@ -26,99 +23,14 @@ CORBA::Boolean
 TAO_Direct_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
                                         RTCORBA::NativePriority &native_priority)
 {
-  if (corba_priority < 0)
-    return 0;
-
-#if defined (ACE_WIN32)
-
-  int current_native_priority = this->min_;
-  int next_native_priority;
-  for (int i = 1; i <= corba_priority; ++i)
-    {
-      next_native_priority =
-        ACE_Sched_Params::next_priority (this->policy_,
-                                         current_native_priority);
-
-      if (next_native_priority == current_native_priority)
-        return 0;
-
-      current_native_priority = next_native_priority;
-    }
-
-  native_priority = current_native_priority;
-  return 1;
-
-#else
-
-  if (this->min_ < this->max_)
-    {
-      native_priority = corba_priority + this->min_;
-      if (native_priority > this->max_)
-        return 0;
-    }
-  else if (this->min_ > this->max_)
-    {
-      native_priority = this->min_ - corba_priority;
-      if (native_priority < this->max_)
-        return 0;
-    }
-  else
-    {
-      // There is only one native priority.
-      if (corba_priority != 0)
-        return 0;
-
-      native_priority = this->min_;
-    }
-
+  native_priority = corba_priority;
   return 1;
-#endif /* ACE_WIN32 */
 }
 
 CORBA::Boolean
 TAO_Direct_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
                                        RTCORBA::Priority &corba_priority)
 {
-#if defined (ACE_WIN32)
-
-  int current_native_priority = this->min_;
-  for (corba_priority = 0; ; ++corba_priority)
-    {
-      if (current_native_priority == native_priority)
-        return 1;
-
-      else if (current_native_priority == this->max_)
-        return 0;
-
-      else
-        current_native_priority =
-          ACE_Sched_Params::next_priority (this->policy_,
-                                           current_native_priority);
-    }
-
-#else
-  if (this->min_ < this->max_)
-    {
-      if (native_priority < this->min_
-          || native_priority > this->max_)
-        return 0;
-      corba_priority = native_priority - this->min_;
-    }
-  else if (this->min_ > this->max_)
-    {
-      if (native_priority > this->min_
-          || native_priority < this->max_)
-        return 0;
-      corba_priority = this->min_ - native_priority;
-    }
-  else if (this->min_ == this->max_)
-    {
-      if (native_priority != this->min_)
-        return 0;
-      corba_priority = 0;
-    }
-
+  corba_priority = native_priority;
   return 1;
-
-#endif /* ACE_WIN32 */
 }
diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
index b5e08e947de..f6d7cb5070f 100644
--- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
@@ -23,7 +23,6 @@
 
 #include "tao/orbconf.h"
 
-#include "rtcorba_export.h"
 #include "Priority_Mapping.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -37,13 +36,9 @@ class TAO_RTCORBA_Export TAO_Direct_Priority_Mapping : public TAO_Priority_Mappi
   //   A simple implementation of the Priority_Mapping interface
   //
   // = DESCRIPTION
-  //   This implementation uses direct mapping between the range of
-  //   priorities for a given scheduling class (ACE_SCHED_OTHER,
-  //   ACE_SCHED_FIFO, ACE_SCHED_RR) and the valid range of CORBA
-  //   priorities (0...32767)
-  //
+  //   This implementation uses direct mapping.
 public:
-  TAO_Direct_Priority_Mapping (long policy);
+  TAO_Direct_Priority_Mapping (long);
   // Default constructor
 
   virtual ~TAO_Direct_Priority_Mapping (void);
@@ -57,12 +52,6 @@ public:
                 RTCORBA::Priority &corba_priority);
 
 private:
-  long policy_;
-  // The scheduling policy
-
-  int min_;
-  int max_;
-  // The range
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
index c81ac2c67ae..f45c7ae3ea0 100644
--- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
@@ -27,7 +27,8 @@ CORBA::Boolean
 TAO_Linear_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
                                         RTCORBA::NativePriority &native_priority)
 {
-  if (corba_priority < 0 || corba_priority > RTCORBA::maxPriority)
+  if (corba_priority < RTCORBA::minPriority ||
+      corba_priority > RTCORBA::maxPriority)
     return 0;
 
 #if defined (ACE_WIN32)
diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp
index 4e1243953ea..84ec0e25b86 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.cpp
+++ b/TAO/tao/RTCORBA/Thread_Pool.cpp
@@ -118,7 +118,8 @@ TAO_Thread_Lane::validate_and_map_priority (CORBA::Environment &ACE_TRY_ENV)
 
   // Map CORBA priority to native priority.
   CORBA::Boolean result =
-    pm->to_native (this->lane_priority_, this->native_priority_);
+    pm->to_native (this->lane_priority_,
+                   this->native_priority_);
 
   if (!result)
     ACE_THROW (CORBA::DATA_CONVERSION ());
diff --git a/TAO/tests/RTCORBA/Banded_Connections/bands.nt b/TAO/tests/RTCORBA/Banded_Connections/bands.nt
index b2d0253c984..0cf0ee603ad 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/bands.nt
+++ b/TAO/tests/RTCORBA/Banded_Connections/bands.nt
@@ -1 +1 @@
-0 1 2 3 4 5
+0 0 1 1
diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
index e28fabf8334..5f30bea8cb3 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
@@ -143,11 +143,11 @@ main (int argc, char *argv[])
                            native_priority),
                           1);
 
-      current->the_priority (desired_priority, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
       for (int i = 0; i < 3; ++i)
         {
+          current->the_priority (desired_priority, ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
           CORBA::Short priority =
             current->the_priority (ACE_TRY_ENV);
           ACE_TRY_CHECK;
@@ -163,9 +163,6 @@ main (int argc, char *argv[])
           ACE_TRY_CHECK;
 
           desired_priority++;
-
-          current->the_priority (desired_priority, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
         }
 
       // Shut down Server ORB.
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
index a8873659715..a66be2852ec 100644
--- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
@@ -9,8 +9,7 @@ ACE_RCSID(Destroy_Thread_Pools, Destroy_Thread_Pools, "$Id$")
 static CORBA::ULong stacksize = 0;
 static CORBA::ULong static_threads = 1;
 static CORBA::ULong dynamic_threads = 0;
-static RTCORBA::Priority default_priority =
-  RTCORBA::Priority (ACE_DEFAULT_THREAD_PRIORITY);
+static RTCORBA::Priority default_thread_priority;
 static CORBA::Boolean allow_request_buffering = 0;
 static CORBA::Boolean allow_borrowing = 0;
 static CORBA::ULong max_buffered_requests = 0;
@@ -51,7 +50,7 @@ create_threadpool (RTCORBA::RTORB_ptr rt_orb,
     rt_orb->create_threadpool (stacksize,
                                static_threads,
                                dynamic_threads,
-                               default_priority,
+                               default_thread_priority,
                                allow_request_buffering,
                                max_buffered_requests,
                                max_request_buffer_size,
@@ -68,11 +67,11 @@ create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb,
   RTCORBA::ThreadpoolLanes lanes (2);
   lanes.length (2);
 
-  lanes[0].lane_priority = default_priority;
+  lanes[0].lane_priority = default_thread_priority;
   lanes[0].static_threads = static_threads;
   lanes[0].dynamic_threads = dynamic_threads;
 
-  lanes[1].lane_priority = default_priority;
+  lanes[1].lane_priority = default_thread_priority;
   lanes[1].static_threads = static_threads;
   lanes[1].dynamic_threads = dynamic_threads;
 
@@ -111,6 +110,20 @@ main (int argc, char *argv[])
                                  ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      object =
+        orb->resolve_initial_references ("RTCurrent",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      RTCORBA::Current_var current =
+        RTCORBA::Current::_narrow (object.in (),
+                                   ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      default_thread_priority =
+        current->the_priority (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
       int result =
         parse_args (argc, argv);
       if (result != 0)
diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
index 48eb3ec67ae..91afdc1ea2a 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
@@ -10,8 +10,6 @@
 
 static int iterations = 5;
 static int shutdown_server = 0;
-static RTCORBA::Priority default_thread_priority =
-RTCORBA::Priority (ACE_DEFAULT_THREAD_PRIORITY);
 
 static const char *ior = "file://ior";
 
@@ -153,7 +151,7 @@ main (int argc, char **argv)
                                    ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      current->the_priority (default_thread_priority,
+      current->the_priority (0,
                              ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
index d727b31b606..9b547003526 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
@@ -64,8 +64,6 @@ test_i::_default_POA (CORBA_Environment &)
 static CORBA::ULong stacksize = 0;
 static CORBA::ULong static_threads = 2;
 static CORBA::ULong dynamic_threads = 2;
-static RTCORBA::Priority default_thread_priority =
-RTCORBA::Priority (ACE_DEFAULT_THREAD_PRIORITY);
 static CORBA::Boolean allow_request_buffering = 0;
 static CORBA::ULong max_buffered_requests = 0;
 static CORBA::ULong max_request_buffer_size = 0;
@@ -209,7 +207,7 @@ main (int argc, char **argv)
 
       CORBA::Policy_var priority_model_policy =
         rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                              default_thread_priority,
+                                              0,
                                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
index 08884f3220c..4997a5d88ef 100755
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
@@ -26,7 +26,7 @@ $priority1 = 65;
 $priority2 = 70;
 
 if ($^O eq "MSWin32") {
-    $priority1 = 6;
+    $priority1 = 2;
     $priority2 = 1;
 }
 elsif ($^O eq "dec_osf") {
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
index 622ee804688..e9eab79deb4 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
@@ -66,8 +66,7 @@ static int debug = 0;
 static CORBA::ULong stacksize = 0;
 static CORBA::ULong static_threads = 2;
 static CORBA::ULong dynamic_threads = 2;
-static RTCORBA::Priority default_thread_priority =
-RTCORBA::Priority (ACE_DEFAULT_THREAD_PRIORITY);
+static RTCORBA::Priority default_thread_priority;
 static CORBA::Boolean allow_request_buffering = 0;
 static CORBA::ULong max_buffered_requests = 0;
 static CORBA::ULong max_request_buffer_size = 0;
@@ -351,6 +350,20 @@ main (int argc, char **argv)
       ACE_TRY_CHECK;
 
       object =
+        orb->resolve_initial_references ("RTCurrent",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      RTCORBA::Current_var current =
+        RTCORBA::Current::_narrow (object.in (),
+                                   ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      default_thread_priority =
+        current->the_priority (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      object =
         orb->resolve_initial_references ("RootPOA",
                                          ACE_TRY_ENV);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
index 82d9faf129f..28da801e2ec 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
@@ -8,8 +8,7 @@
 static const char *ior = 0;
 static int iterations = 5;
 static int shutdown_server = 0;
-static RTCORBA::Priority default_thread_priority =
-  RTCORBA::Priority (ACE_DEFAULT_THREAD_PRIORITY);
+static RTCORBA::Priority default_thread_priority;
 
 static int
 parse_args (int argc, char **argv)
@@ -83,6 +82,10 @@ main (int argc, char **argv)
                                    ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      default_thread_priority =
+        current->the_priority (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
       object =
         orb->string_to_object (ior,
                                ACE_TRY_ENV);
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
index 86810da95cb..ae1863d5c62 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
@@ -100,13 +100,12 @@ test_i::_default_POA (CORBA_Environment &)
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
-static CORBA::Short server_priority = 2;
-static CORBA::Short client_priority = 6;
+static CORBA::Short server_priority = 15;
+static CORBA::Short client_priority = 2;
 static CORBA::ULong stacksize = 0;
 static CORBA::ULong static_threads = 2;
 static CORBA::ULong dynamic_threads = 2;
-static RTCORBA::Priority default_thread_priority =
-RTCORBA::Priority (ACE_DEFAULT_THREAD_PRIORITY);
+static RTCORBA::Priority default_thread_priority;
 static CORBA::Boolean allow_request_buffering = 0;
 static CORBA::ULong max_buffered_requests = 0;
 static CORBA::ULong max_request_buffer_size = 0;
@@ -372,7 +371,7 @@ server::test_bands_poa (CORBA::PolicyList &policies,
   bands[0].low = default_thread_priority;
   bands[0].high = default_thread_priority;
   bands[1].low = ::server_priority;
-  bands[1].high = ::server_priority + 1;
+  bands[1].high = ::server_priority;
   bands[2].low = ::client_priority - 1;
   bands[2].high = ::client_priority;
 
@@ -776,6 +775,20 @@ main (int argc, char **argv)
                                  ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      object =
+        orb->resolve_initial_references ("RTCurrent",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      RTCORBA::Current_var current =
+        RTCORBA::Current::_narrow (object.in (),
+                                   ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      default_thread_priority =
+        current->the_priority (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
       int result =
         parse_args (argc, argv);
       if (result != 0)
diff --git a/TAO/tests/RTCORBA/Server_Declared/run_test.pl b/TAO/tests/RTCORBA/Server_Declared/run_test.pl
index 5fda09022f4..c451df4d68f 100755
--- a/TAO/tests/RTCORBA/Server_Declared/run_test.pl
+++ b/TAO/tests/RTCORBA/Server_Declared/run_test.pl
@@ -26,7 +26,7 @@ print STDERR "Value is " . $^O;
 
 if ($^O eq "MSWin32") {
     $server_args =
-        "-p $iorfile1 -o $iorfile2 -a 3 -b 5";
+        "-p $iorfile1 -o $iorfile2 -a 1 -b 2";
 }
 elsif ($^O eq "dec_osf") {
     $server_args =
diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
index a71869b7bcd..866b5e28b12 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
@@ -114,11 +114,9 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
     CORBA::Policy::_duplicate (threadpool_policy);
 
   // Priority Model policy.
-  RTCORBA::Priority default_priority =
-    RTCORBA::Priority (ACE_DEFAULT_THREAD_PRIORITY);
   policies[2] =
     rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                          default_priority,
+                                          0,
                                           ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
@@ -190,6 +188,30 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      object =
+        orb->resolve_initial_references ("RTORB",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      RTCORBA::RTORB_var rt_orb =
+        RTCORBA::RTORB::_narrow (object.in (),
+                                 ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      object =
+        orb->resolve_initial_references ("RTCurrent",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      RTCORBA::Current_var current =
+        RTCORBA::Current::_narrow (object.in (),
+                                   ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      RTCORBA::Priority default_thread_priority =
+        current->the_priority (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
       int result =
         parse_args (argc, argv);
       if (result != 0)
@@ -215,27 +237,15 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::ULong stacksize = 0;
-      RTCORBA::Priority default_priority =
-        RTCORBA::Priority (ACE_DEFAULT_THREAD_PRIORITY);
       CORBA::Boolean allow_request_buffering = 0;
       CORBA::ULong max_buffered_requests = 0;
       CORBA::ULong max_request_buffer_size = 0;
 
-      object =
-        orb->resolve_initial_references ("RTORB",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in (),
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
       RTCORBA::ThreadpoolId threadpool_id_1 =
         rt_orb->create_threadpool (stacksize,
                                    static_threads,
                                    dynamic_threads,
-                                   default_priority,
+                                   default_thread_priority,
                                    allow_request_buffering,
                                    max_buffered_requests,
                                    max_request_buffer_size,
@@ -251,11 +261,11 @@ main (int argc, char *argv[])
       RTCORBA::ThreadpoolLanes lanes (2);
       lanes.length (2);
 
-      lanes[0].lane_priority = default_priority;
+      lanes[0].lane_priority = default_thread_priority;
       lanes[0].static_threads = static_threads;
       lanes[0].dynamic_threads = dynamic_threads;
 
-      lanes[1].lane_priority = default_priority;
+      lanes[1].lane_priority = default_thread_priority;
       lanes[1].static_threads = static_threads * 2;
       lanes[1].dynamic_threads = dynamic_threads * 2;
 
diff --git a/TAO/threadpool-changes b/TAO/threadpool-changes
index 102f0347536..6c9ecf03a87 100644
--- a/TAO/threadpool-changes
+++ b/TAO/threadpool-changes
@@ -264,7 +264,6 @@ Fri Aug 24 18:08:37 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
 	    TAO_RT_Default_Endpoint_Selector so that we are sure to
 	    take private connection into account.
 
-        * tao/RTCORBA/Direct_Priority_Mapping.cpp:
         * tao/RTCORBA/Linear_Priority_Mapping.cpp:        
         
           - Removed special code in the constructors that was added to
@@ -275,6 +274,10 @@ Fri Aug 24 18:08:37 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
 
           - Changed <policy_> type from int to long.
 
+        * tao/RTCORBA/Direct_Priority_Mapping.cpp: Simplified this
+          class such that it is really direct, i.e., corba priority
+          maps verbatim to native priority and vice versa.
+
 	* tao/RTCORBA/RT_ORBInitializer.cpp (pre_init): Set the
           scheduling policy and scope policy into ORB Parameters.
           Also, converted THR_SCHED_* values into ACE_SCHED_* values.
@@ -883,6 +886,30 @@ Fri Aug 24 18:08:37 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
 	  used by several RT tests to make sure multiple priorities
 	  are supported.
 
+        * tests/RTCORBA/Linear_Priority/client.cpp:
+        * tests/RTCORBA/Linear_Priority/server.cpp:
+
+          No need to use ACE_DEFAULT_THREAD_PRIORITY. 0 is a valid
+          CORBA priority for any range when using Linear mapping.
+
+        * tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp:
+        * tests/RTCORBA/Persistent_IOR/server.cpp:
+        * tests/RTCORBA/Policy_Combinations/client.cpp:
+        * tests/RTCORBA/Policy_Combinations/server.cpp:
+        * tests/RTCORBA/Thread_Pool/server.cpp:
+
+          Removed dependency on ACE_DEFAULT_THREAD_PRIORITY by getting
+          the main thread's priority from the RT Current.
+
+       	* tests/RTCORBA/Banded_Connections/bands.nt: 
+        * tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl:
+        * tests/RTCORBA/Server_Declared/run_test.pl:
+
+          Reworked priority values for NT after the direct mapping
+          became simple.  The only valid CORBA priorities with direct
+          mapping on NT are: 0, 1, 2, and 15.  For bands, only 0, 1,
+          and 2 are counted because of the emptiness between 2 and 15.
+
 	* tests/RTCORBA/RTCORBA_tests.dsw: 
 	* tests/RTCORBA/Makefile: 
 	* tests/RTCORBA/Makefile.bor: 
@@ -941,6 +968,11 @@ Fri Aug 24 18:08:37 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
         * ACE_ROOT/ace/OS.h: THR_SCOPE_PROCESS and THR_SCOPE_SYSTEM
           were not defined for NT.  Added them.
 
+        * ACE_ROOT/ace/OS.cpp: LinuxThreads do not have support for
+          PTHREAD_SCOPE_PROCESS; only PTHREAD_SCOPE_SYSTEM is
+          supported.  Therefore, PTHREAD_SCOPE_PROCESS is ignored when
+          setting the thread scheduling scope.
+
         * ACE_ROOT/bin/auto_run_tests.lst: Added new RTCORBA tests.
           Removed Minimum CORBA dependency on these tests.
 
diff --git a/bin/auto_run_tests.lst b/bin/auto_run_tests.lst
index c9809653bd2..6871619fe8d 100644
--- a/bin/auto_run_tests.lst
+++ b/bin/auto_run_tests.lst
@@ -49,7 +49,7 @@ TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: !MINIMUM !ST !Linux
 TAO/tests/RTCORBA/ORB_init/run_test.pl: !MINIMUM
 TAO/tests/RTCORBA/Persistent_IOR/run_test.pl: !MINIMUM !ST 
 TAO/tests/RTCORBA/Policy_Combinations/run_test.pl: !MINIMUM !ST !Linux
-TAO/tests/RTCORBA/Private_Connection/run_test.pl
+TAO/tests/RTCORBA/Private_Connection/run_test.pl:  !MINIMUM
 TAO/tests/RTCORBA/RTMutex/run_test.pl: !MINIMUM !ST
 TAO/tests/RTCORBA/Server_Declared/run_test.pl: !MINIMUM !ST !Linux
 TAO/tests/RTCORBA/Server_Protocol/run_test.pl: !MINIMUM