ChangeLogTag: Mon Jul 14 12:55:13 2003 Pradeep Gore <pradeep@oomworks.com>

45 files changed, 87 insertions, 55 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 9baf2137ffe..fba0343de2c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,28 @@
+Mon Jul 14 12:55:13 2003  Pradeep Gore  <pradeep@oomworks.com>
+
+	* orbsvcs/tests/Notify/Lanes/run_test.pl:
+	* orbsvcs/tests/Notify/ThreadPool/run_test.pl:
+
+	  Use <Kill> instead of <Wait> to stop the "Still Running on
+	  exit.." error by perl. 
+
+	* orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp:	
+	* orbsvcs/tests/Notify/lib/Options_Parser.cpp:
+	* orbsvcs/tests/Notify/*.conf:
+	
+	  Changed inconsistent use of "ThreadPoolLanes" string to the
+	  easily readable "Lanes".
+	  
+	* orbsvcs/tests/Notify/lib/Driver.cpp:
+ 	* orbsvcs/tests/Notify/lib/Driver.h:
+	* orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl:
+	* orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl:
+	* orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl:
+	* orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl:
+
+	  Added the "-Skip_Priority_Levels_Check" option. We need some
+	  Notify tests to run regardless of the available priority levels.
+	
 Mon Jul 14 11:12:25 2003  Pradeep Gore  <pradeep@oomworks.com>
 
 	* tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp:
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf b/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf
index c01252c2762..6549f739c3a 100644
--- a/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf
@@ -18,7 +18,7 @@ dynamic TAO_Notify_Tests_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTes
 static Command_Builder "Application -Init"
 
 ##----------- Create an RT POA to host local consumer objects-----------
-static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -ThreadPoolLanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
+static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -Lanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
 
 ##--------- Consumer Admin 1 -------------
 static Command_Builder "ConsumerAdmin -Create ca1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl
index f500cb35b62..7d47e3d10ad 100755
--- a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl
@@ -86,7 +86,7 @@ if ($status != 0)
     exit 1;
   }
 
-$Supplier->Wait ();
+$Supplier->Kill ();
 unlink $supplier_ior;
 
 $Notification->Kill ();
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/supplier.conf b/TAO/orbsvcs/tests/Notify/Lanes/supplier.conf
index 9259699d83f..1d663d5a391 100644
--- a/TAO/orbsvcs/tests/Notify/Lanes/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/Lanes/supplier.conf
@@ -29,7 +29,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
 static Command_Builder "Filter -CreateFactory ff ec1"
 
 ### --- Create Supplier Admin 1 ----
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
index fc656c1885c..aca671b802c 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
@@ -335,7 +335,7 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ
       poa_policy_list.length (1);
       poa_policy_list[0] = priority_model_policy;
     }
-  else if (lanes_.length () == 0 && thread_pool_static_threads_ == 0 && bands_.length () != 0)
+  else if (lanes_.length () == 0 && thread_pool_static_threads_ == 0 && bands_.length () > 0)
     {
       poa_policy_list.length (2);
       poa_policy_list[0] = priority_model_policy;
@@ -347,20 +347,20 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ
       poa_policy_list[0] = priority_model_policy;
       poa_policy_list[1] = thread_pool_policy;
     }
-  else if (lanes_.length () == 0 && thread_pool_static_threads_ == 1 && bands_.length () != 0)
+  else if (lanes_.length () == 0 && thread_pool_static_threads_ > 0 && bands_.length () > 0)
     {
       poa_policy_list.length (3);
       poa_policy_list[0] = priority_model_policy;
       poa_policy_list[1] = bands_policy;
       poa_policy_list[2] = thread_pool_policy;
     }
-  else if (lanes_.length () != 0 && thread_pool_static_threads_ == 0 && bands_.length () == 0)
+  else if (lanes_.length () > 0 && thread_pool_static_threads_ == 0 && bands_.length () == 0)
     {
       poa_policy_list.length (2);
       poa_policy_list[0] = priority_model_policy;
       poa_policy_list[1] = lanes_policy;
     }
-  else if (lanes_.length () != 0 && thread_pool_static_threads_ == 0 && bands_.length () != 0)
+  else if (lanes_.length () > 0 && thread_pool_static_threads_ == 0 && bands_.length () > 0)
     {
       poa_policy_list.length (3);
       poa_policy_list[0] = priority_model_policy;
diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl
index 22a7f5673aa..d5c758f77b3 100755
--- a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl
@@ -84,7 +84,7 @@ if ($status != 0)
     exit 1;
   }
 
-$Supplier->Wait ();
+$Supplier->Kill ();
 unlink $supplier_ior;
 
 $Notification->Kill ();
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
index 07c66171a53..30ba2053cc1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
@@ -161,7 +161,7 @@ TAO_Notify_Tests_ORB_Run_Worker::svc (void)
 /*****************************************************************/
 
 TAO_Notify_Tests_Driver::TAO_Notify_Tests_Driver (void)
-  :cmd_builder_ (0), activation_manager_ (0), run_period_ (0,0)
+  :cmd_builder_ (0), activation_manager_ (0), run_period_ (0,0), skip_priority_levels_check_ (0)
 {
   this->activation_manager_ = new TAO_Notify_Tests_Activation_Manager ();
   LOOKUP_MANAGER->_register (this->activation_manager_);
@@ -210,6 +210,12 @@ TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[])
 
           arg_shifter.consume_arg ();
         }
+      else if (arg_shifter.cur_arg_strncasecmp ("-Skip_Priority_Levels_Check") == 0) // Skip the check for multiple priority levels.
+        {
+          this->skip_priority_levels_check_ = 1;
+
+          arg_shifter.consume_arg ();
+        }
       else
         {
           arg_shifter.ignore_arg ();
@@ -235,7 +241,8 @@ TAO_Notify_Tests_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
 
   // Make sure we can support multiple priorities that are required
   // for this test.
-  check_supported_priorities (this->orb_.in());
+  if (skip_priority_levels_check_ == 0)
+    check_supported_priorities (this->orb_.in());
 
   LOOKUP_MANAGER->init (this->orb_.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.h b/TAO/orbsvcs/tests/Notify/lib/Driver.h
index 64f004fd874..2053258841f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.h
@@ -140,6 +140,9 @@ protected:
 
   /// The file for input
   ACE_CString ior_input_file_;
+
+  /// Set to skip the check for multiple priority levels.
+  int skip_priority_levels_check_;
 };
 
 #include "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
index f29374aba02..916e19b5ec7 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
@@ -89,7 +89,7 @@ TAO_Notify_Tests_Options_Parser::execute (CosNotification::QoSProperties& qos, A
       qos[0].value <<= tp_params;
 
     } /* ThreadPool */
-  else if (arg_shifter.cur_arg_strncasecmp ("-ThreadPoolLanes") == 0) // -ThreadPoolLanes lane_count -Lane prio static_thr dy_thr
+  else if (arg_shifter.cur_arg_strncasecmp ("-Lanes") == 0) // -Lanes lane_count -Lane prio static_thr dy_thr
     {
       arg_shifter.consume_arg ();
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_0/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_0/supplier.conf
index 06b9f8d5024..41caee79544 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_0/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_0/supplier.conf
@@ -15,7 +15,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 2 -Lane 0 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_10/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_10/supplier.conf
index 4e3baed56e9..e07288e9ab4 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_10/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_10/supplier.conf
@@ -15,7 +15,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 2 -Lane 0 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_15/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_15/supplier.conf
index 9f89a870954..d57a683ce85 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_15/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_15/supplier.conf
@@ -15,7 +15,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 2 -Lane 0 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_20/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_20/supplier.conf
index 77b76bbd5ad..e8ee9b61181 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_20/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_20/supplier.conf
@@ -15,7 +15,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 2 -Lane 0 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_25/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_25/supplier.conf
index 05075e0a0ca..92581d0d9d0 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_25/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_25/supplier.conf
@@ -15,7 +15,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 2 -Lane 0 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_30/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_30/supplier.conf
index 34edacba60c..a9c375d4d49 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_30/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_30/supplier.conf
@@ -15,7 +15,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 2 -Lane 0 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_35/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_35/supplier.conf
index d1cdd106f68..9079f35b318 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_35/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_35/supplier.conf
@@ -15,7 +15,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 2 -Lane 0 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_40/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_40/supplier.conf
index 03a6d3fd661..21df10c5c4b 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_40/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_40/supplier.conf
@@ -15,7 +15,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 2 -Lane 0 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_45/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_45/supplier.conf
index 656e0179b3c..f69c5982511 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_45/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_45/supplier.conf
@@ -15,7 +15,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 2 -Lane 0 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_5/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_5/supplier.conf
index 25c9a568511..1fcb9f7ae8b 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_5/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_5/supplier.conf
@@ -15,7 +15,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 2 -Lane 0 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_50/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_50/supplier.conf
index b45223cd022..3a67f344b30 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_50/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/Load_50/supplier.conf
@@ -15,7 +15,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 2 -Lane 0 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_0/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_0/supplier.conf
index ca0c3c49430..f93dfef585b 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_0/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_0/supplier.conf
@@ -16,7 +16,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_10/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_10/supplier.conf
index 20fc0d9ec55..d5527347aa3 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_10/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_10/supplier.conf
@@ -16,7 +16,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_15/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_15/supplier.conf
index 2b675effd7f..6b95b50d776 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_15/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_15/supplier.conf
@@ -16,7 +16,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_20/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_20/supplier.conf
index 3dde06aaee4..e0919772da1 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_20/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_20/supplier.conf
@@ -16,7 +16,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_25/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_25/supplier.conf
index 09c26cfd4c4..fc5dd82ca19 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_25/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_25/supplier.conf
@@ -16,7 +16,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_30/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_30/supplier.conf
index f734e30cdd0..125e165bd91 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_30/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_30/supplier.conf
@@ -16,7 +16,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_35/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_35/supplier.conf
index db9a288a90c..3d4277af7bd 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_35/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_35/supplier.conf
@@ -16,7 +16,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_40/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_40/supplier.conf
index 3dac68069ae..272165ceeab 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_40/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_40/supplier.conf
@@ -16,7 +16,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_45/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_45/supplier.conf
index a4c6e817e2d..e574f7fd68d 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_45/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_45/supplier.conf
@@ -16,7 +16,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_5/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_5/supplier.conf
index e6b46d64e18..f1decd4075c 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_5/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_5/supplier.conf
@@ -16,7 +16,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_50/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_50/supplier.conf
index df5a1146a6e..171e20bde96 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_50/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_50/supplier.conf
@@ -16,7 +16,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl
index d9eb350d2e9..01ccf03a55d 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl
@@ -22,12 +22,12 @@ $Naming = new PerlACE::Process ("../../../../../../Naming_Service/Naming_Service
 
 $Supplier = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
 
-$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$consumer_ior -ORBSvcConf $supplier_conf";
+$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$consumer_ior -ORBSvcConf $supplier_conf -Skip_Priority_Levels_Check";
 
 $Consumer = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
 
 #$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $consumer_ior -ORBSvcConf $consumer_conf -ORBDebugLevel 1";
-$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $consumer_ior -ORBSvcConf $consumer_conf";
+$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $consumer_ior -ORBSvcConf $consumer_conf -Skip_Priority_Levels_Check";
 
 unlink $naming_ior;
 $Naming->Spawn ();
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/consumer.conf
index 6c695fe477a..d3847f4b544 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/consumer.conf
@@ -14,7 +14,7 @@ dynamic TAO_Notify_Tests_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTes
 static Command_Builder "Application -Init"
 
 ##----------- Create an RT POA to host local consumer objects-----------
-static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 1 1 0"
+static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -Lanes 2 -Lane 0 1 0 -Lane 1 1 0"
 
 ##--------- Consumer 3 , connected to CA 1 --------
 static Command_Builder "PeriodicConsumer -Create c_high -Direct -POA poa_1"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/relay.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/relay.conf
index f6200a42068..7aa46580585 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/relay.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/relay.conf
@@ -14,7 +14,7 @@ dynamic TAO_Notify_Tests_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTes
 static Command_Builder "Application -Init"
 
 ##----------- Create an RT POA to host local consumer objects-----------
-static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -ThreadPoolLanes 4 -Lane 1 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0"
+static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -Lanes 4 -Lane 1 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0"
 
 
 ##--------- Consumer 1 , connected to CA 1 --------
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl
index 3fc76f501a0..ef4585df832 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl
@@ -26,15 +26,15 @@ $Naming = new PerlACE::Process ("../../../../../../Naming_Service/Naming_Service
 
 $Supplier = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
 
-$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$relay_ior -ORBSvcConf $supplier_conf";
+$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$relay_ior -ORBSvcConf $supplier_conf -Skip_Priority_Levels_Check";
 
 $Consumer = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
 
-$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $consumer_ior -ORBSvcConf $consumer_conf";
+$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $consumer_ior -ORBSvcConf $consumer_conf -Skip_Priority_Levels_Check";
 
 $Relay = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
 
-$Relay_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $relay_ior -IORinput file://$consumer_ior -ORBSvcConf $relay_conf";
+$Relay_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $relay_ior -IORinput file://$consumer_ior -ORBSvcConf $relay_conf -Skip_Priority_Levels_Check";
 
 unlink $naming_ior;
 $Naming->Spawn ();
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/consumer.conf
index 6c695fe477a..d3847f4b544 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/consumer.conf
@@ -14,7 +14,7 @@ dynamic TAO_Notify_Tests_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTes
 static Command_Builder "Application -Init"
 
 ##----------- Create an RT POA to host local consumer objects-----------
-static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 1 1 0"
+static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -Lanes 2 -Lane 0 1 0 -Lane 1 1 0"
 
 ##--------- Consumer 3 , connected to CA 1 --------
 static Command_Builder "PeriodicConsumer -Create c_high -Direct -POA poa_1"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/relay.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/relay.conf
index 203e7ca05e4..1936c15e1d4 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/relay.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/relay.conf
@@ -14,7 +14,7 @@ dynamic TAO_Notify_Tests_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTes
 static Command_Builder "Application -Init"
 
 ##----------- Create an RT POA to host local consumer objects-----------
-static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 1 1 0"
+static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -Lanes 2 -Lane 0 1 0 -Lane 1 1 0"
 
 ##--------- Consumer 3 , connected to CA 1 --------
 static Command_Builder "PeriodicConsumer -Create c_high_relay -Relay c_high -POA poa_1"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl
index c02949d6c54..97b29cc7847 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl
@@ -19,7 +19,7 @@ $Naming = new PerlACE::Process ("../../../../../../Naming_Service/Naming_Service
 
 $Collocated = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
 
-$Collocated_Args = "-ORBInitRef NameService=file://$naming_ior -ORBSvcConf $collocated_conf";
+$Collocated_Args = "-ORBInitRef NameService=file://$naming_ior -ORBSvcConf $collocated_conf -Skip_Priority_Levels_Check";
 
 unlink $naming_ior;
 $Naming->Spawn ();
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf
index 7c144b3ae18..96ca3f54882 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf
@@ -27,10 +27,10 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory COLLOCATED"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 1 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 2 -Lane 0 1 0 -Lane 1 1 0"
 
 ##----------- Create an RT POA to host local consumer objects-----------
-static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 1 1 0"
+static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -Lanes 2 -Lane 0 1 0 -Lane 1 1 0"
 
 ###
 ###  Configure Supplier and Consumer for the High Priority Path
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl
index 2e9bbf4d9fb..4240b4f2c2a 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl
@@ -68,18 +68,15 @@ $Naming = new PerlACE::Process ("../../../../../../Naming_Service/Naming_Service
 
 $Notification = new PerlACE::Process ("../../../../../../Notify_Service/Notify_Service");
 
-#$Notify_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $notify_ior -ORBSvcConf $notify_conf -ORBDebugLevel 1";
-
 $Notify_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $notify_ior -ORBSvcConf $notify_conf";
 
 $Supplier = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
 
-$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $supplier_ior -ORBSvcConf $supplier_conf";
+$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $supplier_ior -ORBSvcConf $supplier_conf -Skip_Priority_Levels_Check";
 
 $Consumer = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
 
-$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf";
-#$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf -ORBDebugLevel 1";
+$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf -Skip_Priority_Levels_Check";
 
 unlink $naming_ior;
 $Naming->Spawn ();
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/supplier.conf
index a5343317b6d..62e6b68d481 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/supplier.conf
@@ -16,7 +16,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 1 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 2 -Lane 0 1 0 -Lane 1 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_10/other_paths.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_10/other_paths.conf
index b68e4c499bb..4a3e8d5af25 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_10/other_paths.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_10/other_paths.conf
@@ -22,7 +22,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 #static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-#static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 3 -Lane 0 1 0 -Lane 1 1 0 -Lane 3 1 0"
+#static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 3 -Lane 0 1 0 -Lane 1 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa_oth ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_20/other_paths.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_20/other_paths.conf
index d1771005a06..5ee138807fe 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_20/other_paths.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_20/other_paths.conf
@@ -22,7 +22,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 #static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-#static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 3 -Lane 0 1 0 -Lane 1 1 0 -Lane 3 1 0"
+#static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 3 -Lane 0 1 0 -Lane 1 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa_oth ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_5/other_paths.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_5/other_paths.conf
index b760fca7855..5d58e1497e3 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_5/other_paths.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/Paths_5/other_paths.conf
@@ -22,7 +22,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 #static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-#static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 3 -Lane 0 1 0 -Lane 1 1 0 -Lane 3 1 0"
+#static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 3 -Lane 0 1 0 -Lane 1 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa_oth ec1 -AND_OP"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/high_path.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/high_path.conf
index c4fa5df2f43..093a1f720c7 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/high_path.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/high_path.conf
@@ -22,7 +22,7 @@ static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 3 -Lane 0 1 0 -Lane 1 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 3 -Lane 0 1 0 -Lane 1 1 0 -Lane 3 1 0"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa_high ec1 -AND_OP"