diff options
| author | pradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-06-10 17:47:04 +0000 |
|---|---|---|
| committer | pradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-06-10 17:47:04 +0000 |
| commit | 93ccb08385d149ac6eecb3c4feccd6b7ee68e21a (patch) | |
| tree | 03ff41e1c644cdec67c0c03a5b78251c80e756ca | |
| parent | ae847ff13be88bdda7ed157b43de1219aaca9dab (diff) | |
| download | ATCD-93ccb08385d149ac6eecb3c4feccd6b7ee68e21a.tar.gz | |
ChangeLogTag: Tue Jun 10 13:23:57 2003 Pradeep Gore <pradeep@oomworks.com>
47 files changed, 188 insertions, 398 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 300eac9a667..ffee9d5fae7 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Tue Jun 10 13:23:57 2003 Pradeep Gore <pradeep@oomworks.com> + + * orbsvcs/tests/Notify/performance-tests/scripts/*.conf: + Changed to use the continuous priority model. + Sun Jun 8 19:53:04 2003 Pradeep Gore <pradeep@oomworks.com> * orbsvcs/orbsvcs/Notify/AdminProperties.cpp: diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_0/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_0/supplier.conf index 40f765e7015..f1bb6693df1 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_0/supplier.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_0/supplier.conf @@ -1,7 +1,7 @@ ## $Id$ ##---- Load the Factories------ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () "" ##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -15,13 +15,13 @@ 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 1 1 0 -Lane 50 1 0 -Lane 90 1 0" +static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 3 1 0" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 0 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 3 -Period 10000 -Iter 50000 -Load 0 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -29,4 +29,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_10/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_10/supplier.conf index c94c773cf14..7b4c5845f3d 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_10/supplier.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_10/supplier.conf @@ -1,7 +1,7 @@ ## $Id$ ##---- Load the Factories------ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () "" ##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -15,13 +15,13 @@ 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 1 1 0 -Lane 50 1 0 -Lane 90 1 0" +static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 3 1 0" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 10 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 3 -Period 10000 -Iter 50000 -Load 10 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -29,4 +29,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_15/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_15/supplier.conf index cca64d86524..bef03eb4c18 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_15/supplier.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_15/supplier.conf @@ -1,7 +1,7 @@ ## $Id$ ##---- Load the Factories------ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () "" ##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -15,13 +15,13 @@ 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 1 1 0 -Lane 50 1 0 -Lane 90 1 0" +static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 3 1 0" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 15 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 3 -Period 10000 -Iter 50000 -Load 15 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -29,4 +29,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_20/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_20/supplier.conf index 70af3c0a13c..a1381ece3e7 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_20/supplier.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_20/supplier.conf @@ -1,7 +1,7 @@ ## $Id$ ##---- Load the Factories------ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () "" ##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -15,13 +15,13 @@ 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 1 1 0 -Lane 50 1 0 -Lane 90 1 0" +static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 3 1 0" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 20 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 3 -Period 10000 -Iter 50000 -Load 20 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -29,4 +29,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_25/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_25/supplier.conf index 093c15fca1c..7fa9be9687f 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_25/supplier.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_25/supplier.conf @@ -1,7 +1,7 @@ ## $Id$ ##---- Load the Factories------ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () "" ##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -15,13 +15,13 @@ 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 1 1 0 -Lane 50 1 0 -Lane 90 1 0" +static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 3 1 0" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 25 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 3 -Period 10000 -Iter 50000 -Load 25 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -29,4 +29,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_30/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_30/supplier.conf index 7912eaefff7..19bac9d84a6 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_30/supplier.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_30/supplier.conf @@ -1,7 +1,7 @@ ## $Id$ ##---- Load the Factories------ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () "" ##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -15,13 +15,13 @@ 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 1 1 0 -Lane 50 1 0 -Lane 90 1 0" +static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 3 1 0" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 30 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 3 -Period 10000 -Iter 50000 -Load 30 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -29,4 +29,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_35/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_35/supplier.conf index 25f4732e16e..8120bd711d7 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_35/supplier.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_35/supplier.conf @@ -1,7 +1,7 @@ ## $Id$ ##---- Load the Factories------ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () "" ##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -15,13 +15,13 @@ 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 1 1 0 -Lane 50 1 0 -Lane 90 1 0" +static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 3 1 0" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 35 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 3 -Period 10000 -Iter 50000 -Load 35 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -29,4 +29,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_40/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_40/supplier.conf index 6bfca4d39c4..1f680aa4bc3 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_40/supplier.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_40/supplier.conf @@ -1,7 +1,7 @@ ## $Id$ ##---- Load the Factories------ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () "" ##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -15,13 +15,13 @@ 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 1 1 0 -Lane 50 1 0 -Lane 90 1 0" +static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 3 1 0" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 40 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 3 -Period 10000 -Iter 50000 -Load 40 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -29,4 +29,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_45/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_45/supplier.conf index d23f35bc0a2..99bbbe708f1 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_45/supplier.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_45/supplier.conf @@ -1,7 +1,7 @@ ## $Id$ ##---- Load the Factories------ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () "" ##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -15,13 +15,13 @@ 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 1 1 0 -Lane 50 1 0 -Lane 90 1 0" +static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 3 1 0" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 45 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 3 -Period 10000 -Iter 50000 -Load 45 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -29,4 +29,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_5/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_5/supplier.conf index 8fc62c3a19c..31069cdc33a 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_5/supplier.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_5/supplier.conf @@ -1,7 +1,7 @@ ## $Id$ ##---- Load the Factories------ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () "" ##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -15,13 +15,13 @@ 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 1 1 0 -Lane 50 1 0 -Lane 90 1 0" +static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 3 1 0" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 5 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 3 -Period 10000 -Iter 50000 -Load 5 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_50/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_50/supplier.conf index 450611a19e6..a0017b3a09d 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_50/supplier.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_50/supplier.conf @@ -1,7 +1,7 @@ ## $Id$ ##---- Load the Factories------ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () "" ##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -15,13 +15,13 @@ 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 1 1 0 -Lane 50 1 0 -Lane 90 1 0" +static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 3 1 0" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 50 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 3 -Period 10000 -Iter 50000 -Load 50 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -29,4 +29,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/consumer.conf index de497511116..fadd9c30538 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/consumer.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/consumer.conf @@ -1,6 +1,6 @@ ## $Id$ ##---- Load the Factories------ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () "" @@ -14,7 +14,7 @@ dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_T static Command_Builder "Application -Init" ##----------- Create an RT POA to host local consumer objects----------- -static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -Lanes 3 -Lane 1 1 0 -Lane 50 1 0 -Lane 90 1 0" +static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -Lanes 2 -Lane 0 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/performance-tests/scripts/1_Path_Period_10ms_Lanes/cos_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/cos_notify.conf index cc95424c25d..06d934e65cf 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/cos_notify.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/cos_notify.conf @@ -1,4 +1,2 @@ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" -dynamic TAO_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_Default_Factory () "" -dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () "" - +dynamic TAO_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_Default_Factory () "" +dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () "" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/rt_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/rt_notify.conf index c2c8a049a4b..d7e0083e0eb 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/rt_notify.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/rt_notify.conf @@ -1,4 +1,3 @@ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" -dynamic TAO_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_Default_Factory () "" -dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () "" - +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" +dynamic TAO_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_Default_Factory () "" +dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () "" 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 f60a912ed0d..0bde1b5de12 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 @@ -1,14 +1,5 @@ ## $Id$ -## This file has the following configuration: -## EventChannel ec1 with 1 Thread -## SupplierAdmim sa1 with 1 Thread -## SupplierAdmin sa2 -## -## Supplier s1 has 1 Thread and is connected to sa1 -## Supplier s2 is connected to sa1 -## -## Supplier s3 is connected to sa2 -## +## ##---- Load the Factories------ dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" @@ -25,19 +16,19 @@ 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 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0" +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" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" ### --- Create Supplier s1 connected to sa1. ----- -static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 0 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 1 -Period 10000 -Iter 50000 -Load 0 -RunTime 15" ### --- Create Supplier s2 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 0 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 2 -Period 10000 -Iter 50000 -Load 0 -RunTime 15" ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 0 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 3 -Period 10000 -Iter 50000 -Load 0 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -45,4 +36,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - 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 5bfa97cf88b..a991dd71dfb 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 @@ -1,14 +1,5 @@ ## $Id$ -## This file has the following configuration: -## EventChannel ec1 with 1 Thread -## SupplierAdmim sa1 with 1 Thread -## SupplierAdmin sa2 -## -## Supplier s1 has 1 Thread and is connected to sa1 -## Supplier s2 is connected to sa1 -## -## Supplier s3 is connected to sa2 -## +## ##---- Load the Factories------ dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" @@ -25,19 +16,19 @@ static Command_Builder "Application -Init" ##------- Create Event Channel --------------- static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory" -static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0" +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" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" ### --- Create Supplier s1 connected to sa1. ----- -static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 10 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 1 -Period 10000 -Iter 50000 -Load 10 -RunTime 15" ### --- Create Supplier s2 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 10 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 2 -Period 10000 -Iter 50000 -Load 10 -RunTime 15" ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 10 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 3 -Period 10000 -Iter 50000 -Load 10 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -45,4 +36,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - 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 1d2e5d17a34..eea5c26ad8d 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 @@ -1,14 +1,5 @@ ## $Id$ -## This file has the following configuration: -## EventChannel ec1 with 1 Thread -## SupplierAdmim sa1 with 1 Thread -## SupplierAdmin sa2 -## -## Supplier s1 has 1 Thread and is connected to sa1 -## Supplier s2 is connected to sa1 -## -## Supplier s3 is connected to sa2 -## +## ##---- Load the Factories------ dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" @@ -25,19 +16,19 @@ static Command_Builder "Application -Init" ##------- Create Event Channel --------------- static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory" -static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0" +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" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" ### --- Create Supplier s1 connected to sa1. ----- -static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 15 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 1 -Period 10000 -Iter 50000 -Load 15 -RunTime 15" ### --- Create Supplier s2 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 15 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 2 -Period 10000 -Iter 50000 -Load 15 -RunTime 15" ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 15 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 3 -Period 10000 -Iter 50000 -Load 15 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -45,4 +36,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - 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 3436d7c884c..d8e4409b85a 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 @@ -1,14 +1,5 @@ ## $Id$ -## This file has the following configuration: -## EventChannel ec1 with 1 Thread -## SupplierAdmim sa1 with 1 Thread -## SupplierAdmin sa2 -## -## Supplier s1 has 1 Thread and is connected to sa1 -## Supplier s2 is connected to sa1 -## -## Supplier s3 is connected to sa2 -## +## ##---- Load the Factories------ dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" @@ -25,19 +16,19 @@ static Command_Builder "Application -Init" ##------- Create Event Channel --------------- static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory" -static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0" +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" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" ### --- Create Supplier s1 connected to sa1. ----- -static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 20 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 1 -Period 10000 -Iter 50000 -Load 20 -RunTime 15" ### --- Create Supplier s2 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 20 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 2 -Period 10000 -Iter 50000 -Load 20 -RunTime 15" ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 20 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 3 -Period 10000 -Iter 50000 -Load 20 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -45,4 +36,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - 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 a9d569bba22..653ab7b569a 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 @@ -1,14 +1,5 @@ ## $Id$ -## This file has the following configuration: -## EventChannel ec1 with 1 Thread -## SupplierAdmim sa1 with 1 Thread -## SupplierAdmin sa2 -## -## Supplier s1 has 1 Thread and is connected to sa1 -## Supplier s2 is connected to sa1 -## -## Supplier s3 is connected to sa2 -## +## ##---- Load the Factories------ dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" @@ -25,19 +16,19 @@ static Command_Builder "Application -Init" ##------- Create Event Channel --------------- static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory" -static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0" +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" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" ### --- Create Supplier s1 connected to sa1. ----- -static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 25 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 1 -Period 10000 -Iter 50000 -Load 25 -RunTime 15" ### --- Create Supplier s2 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 25 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 2 -Period 10000 -Iter 50000 -Load 25 -RunTime 15" ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 25 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 3 -Period 10000 -Iter 50000 -Load 25 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -45,4 +36,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - 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 ab3d12d75aa..7ba39706f6a 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 @@ -1,14 +1,5 @@ ## $Id$ -## This file has the following configuration: -## EventChannel ec1 with 1 Thread -## SupplierAdmim sa1 with 1 Thread -## SupplierAdmin sa2 -## -## Supplier s1 has 1 Thread and is connected to sa1 -## Supplier s2 is connected to sa1 -## -## Supplier s3 is connected to sa2 -## +## ##---- Load the Factories------ dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" @@ -25,19 +16,19 @@ static Command_Builder "Application -Init" ##------- Create Event Channel --------------- static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory" -static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0" +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" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" ### --- Create Supplier s1 connected to sa1. ----- -static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 30 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 1 -Period 10000 -Iter 50000 -Load 30 -RunTime 15" ### --- Create Supplier s2 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 30 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 2 -Period 10000 -Iter 50000 -Load 30 -RunTime 15" ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 30 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 3 -Period 10000 -Iter 50000 -Load 30 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -45,4 +36,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - 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 ed7f23f47ad..2ec839d9575 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 @@ -1,14 +1,5 @@ ## $Id$ -## This file has the following configuration: -## EventChannel ec1 with 1 Thread -## SupplierAdmim sa1 with 1 Thread -## SupplierAdmin sa2 -## -## Supplier s1 has 1 Thread and is connected to sa1 -## Supplier s2 is connected to sa1 -## -## Supplier s3 is connected to sa2 -## +## ##---- Load the Factories------ dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" @@ -25,19 +16,19 @@ static Command_Builder "Application -Init" ##------- Create Event Channel --------------- static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory" -static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0" +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" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" ### --- Create Supplier s1 connected to sa1. ----- -static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 35 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 1 -Period 10000 -Iter 50000 -Load 35 -RunTime 15" ### --- Create Supplier s2 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 35 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 2 -Period 10000 -Iter 50000 -Load 35 -RunTime 15" ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 35 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 3 -Period 10000 -Iter 50000 -Load 35 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -45,4 +36,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - 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 2cc614ccfcb..7f71c315be0 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 @@ -1,14 +1,5 @@ ## $Id$ -## This file has the following configuration: -## EventChannel ec1 with 1 Thread -## SupplierAdmim sa1 with 1 Thread -## SupplierAdmin sa2 -## -## Supplier s1 has 1 Thread and is connected to sa1 -## Supplier s2 is connected to sa1 -## -## Supplier s3 is connected to sa2 -## +## ##---- Load the Factories------ dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" @@ -25,19 +16,19 @@ static Command_Builder "Application -Init" ##------- Create Event Channel --------------- static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory" -static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0" +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" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" ### --- Create Supplier s1 connected to sa1. ----- -static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 40 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 1 -Period 10000 -Iter 50000 -Load 40 -RunTime 15" ### --- Create Supplier s2 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 40 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 2 -Period 10000 -Iter 50000 -Load 40 -RunTime 15" ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 40 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 3 -Period 10000 -Iter 50000 -Load 40 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -45,4 +36,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - 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 7ee4ec827e7..dcc5c15f920 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 @@ -1,14 +1,5 @@ ## $Id$ -## This file has the following configuration: -## EventChannel ec1 with 1 Thread -## SupplierAdmim sa1 with 1 Thread -## SupplierAdmin sa2 -## -## Supplier s1 has 1 Thread and is connected to sa1 -## Supplier s2 is connected to sa1 -## -## Supplier s3 is connected to sa2 -## +## ##---- Load the Factories------ dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" @@ -25,21 +16,19 @@ static Command_Builder "Application -Init" ##------- Create Event Channel --------------- static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory" -# CosNotification does not support Lanes so we use 3 threads. -#static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPool -Threads 1 -Priority 0" -#static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0" +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" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" ### --- Create Supplier s1 connected to sa1. ----- -static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 45 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 1 -Period 10000 -Iter 50000 -Load 45 -RunTime 15" ### --- Create Supplier s2 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 45 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 2 -Period 10000 -Iter 50000 -Load 45 -RunTime 15" ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 45 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 3 -Period 10000 -Iter 50000 -Load 45 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -47,4 +36,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - 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 93fbbcb2244..66646af007e 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 @@ -1,14 +1,5 @@ ## $Id$ -## This file has the following configuration: -## EventChannel ec1 with 1 Thread -## SupplierAdmim sa1 with 1 Thread -## SupplierAdmin sa2 -## -## Supplier s1 has 1 Thread and is connected to sa1 -## Supplier s2 is connected to sa1 -## -## Supplier s3 is connected to sa2 -## +## ##---- Load the Factories------ dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" @@ -25,19 +16,19 @@ static Command_Builder "Application -Init" ##------- Create Event Channel --------------- static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory" -static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0" +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" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" ### --- Create Supplier s1 connected to sa1. ----- -static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 5 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 1 -Period 10000 -Iter 50000 -Load 5 -RunTime 15" ### --- Create Supplier s2 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 5 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 2 -Period 10000 -Iter 50000 -Load 5 -RunTime 15" ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 5 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 3 -Period 10000 -Iter 50000 -Load 5 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -45,4 +36,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - 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 8e103ead0fa..6d7e53891f2 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 @@ -1,14 +1,5 @@ ## $Id$ -## This file has the following configuration: -## EventChannel ec1 with 1 Thread -## SupplierAdmim sa1 with 1 Thread -## SupplierAdmin sa2 -## -## Supplier s1 has 1 Thread and is connected to sa1 -## Supplier s2 is connected to sa1 -## -## Supplier s3 is connected to sa2 -## +## ##---- Load the Factories------ dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" @@ -25,19 +16,19 @@ static Command_Builder "Application -Init" ##------- Create Event Channel --------------- static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory" -static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0" +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" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" ### --- Create Supplier s1 connected to sa1. ----- -static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 50 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 1 -Period 10000 -Iter 50000 -Load 50 -RunTime 15" ### --- Create Supplier s2 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 50 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 2 -Period 10000 -Iter 50000 -Load 50 -RunTime 15" ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 50 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 3 -Period 10000 -Iter 50000 -Load 50 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -45,4 +36,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/consumer.conf index 7b8cc52238e..d4259937c34 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/consumer.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/consumer.conf @@ -1,6 +1,6 @@ ## $Id$ ##---- Load the Factories------ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () "" ##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -14,8 +14,7 @@ dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_T static Command_Builder "Application -Init" ##----------- Create an RT POA to host local consumer objects----------- -static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -Lanes 5 -Lane 1 1 0 -Lane 50 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 3 -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 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/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf index cc95424c25d..06d934e65cf 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf @@ -1,4 +1,2 @@ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" -dynamic TAO_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_Default_Factory () "" -dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () "" - +dynamic TAO_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_Default_Factory () "" +dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () "" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf index c2c8a049a4b..d7e0083e0eb 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf @@ -1,4 +1,3 @@ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" -dynamic TAO_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_Default_Factory () "" -dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () "" - +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" +dynamic TAO_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_Default_Factory () "" +dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () "" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/consumer.conf index 32d6bf1c012..b8b9ae44aa4 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/consumer.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/consumer.conf @@ -1,4 +1,8 @@ ## $Id$ +# +# Note that this test is not portable because it does not use RTCORBA. +# All priority values are for Linux +# ##---- Load the Factories------ dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -9,12 +13,6 @@ dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests ##------- Init the Application Object ---------- static Command_Builder "Application -Init" -##--------- Consumer 1 , connected to CA 1 -------- -#static Command_Builder "PeriodicConsumer -Create c_low -Direct" - -##--------- Consumer 2 , connected to CA 1 -------- -#static Command_Builder "PeriodicConsumer -Create c_med -Direct" - ##--------- Consumer 3 , connected to CA 1 -------- static Command_Builder "PeriodicConsumer -Create c_high -Direct" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/supplier.conf index 00bc986a146..326d1a81c5a 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/supplier.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/supplier.conf @@ -1,6 +1,8 @@ ## $Id$ -## This file has the following configuration: -## +# +# Note that this test is not portable because it does not use RTCORBA. +# All priority values are for Linux +# ##---- Load the Factories------ dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -12,14 +14,8 @@ dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests ##------- Init the Application Object ---------- static Command_Builder "Application -Init" -### --- Create Supplier s1 connected to sa1. ----- -#static Command_Builder "PeriodicSupplier -Create s_low -Direct c_low -EventType L -Priority 10 -Period 0 -Iter 5000 -Load 0 -RunTime 15" - -### --- Create Supplier s2 connected to sa1 ---- -#static Command_Builder "PeriodicSupplier -Create s_med -Direct c_med -EventType M -Priority 60 -Period 0 -Iter 5000 -Load 0 -RunTime 15" - -### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Direct c_high -EventType H -Priority 90 -Period 0 -Iter 50000 -Load 0 -RunTime 15" +### --- Create Supplier connected to sa1 ---- +static Command_Builder "PeriodicSupplier -Create s_high -Direct c_high -EventType H -Priority 2 -Period 0 -Iter 50000 -Load 0 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -SignalPeer" @@ -27,4 +23,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - 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 d65da00875d..b6406954e9c 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 @@ -1,6 +1,6 @@ ## $Id$ ##---- Load the Factories------ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () "" ##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -14,14 +14,7 @@ dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_T 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" - - -##--------- Consumer 1 , connected to CA 1 -------- -#static Command_Builder "PeriodicConsumer -Create c_low -Direct -POA poa_1" - -##--------- Consumer 2 , connected to CA 1 -------- -#static Command_Builder "PeriodicConsumer -Create c_med -Direct -POA poa_1" +static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -ThreadPoolLanes 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/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/supplier.conf index 432dc5f51e9..9819b1e351f 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/supplier.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/supplier.conf @@ -1,18 +1,8 @@ ## $Id$ -## This file has the following configuration: -## EventChannel ec1 with 1 Thread -## SupplierAdmim sa1 with 1 Thread -## SupplierAdmin sa2 -## -## Supplier s1 has 1 Thread and is connected to sa1 -## Supplier s2 is connected to sa1 -## -## Supplier s3 is connected to sa2 -## +## ##---- Load the Factories------ -dynamic TAO_RT_ORB_Loader Service_Object -*TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () "" ##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -24,14 +14,8 @@ dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests ##------- Init the Application Object ---------- static Command_Builder "Application -Init" -### --- Create Supplier s1 connected to sa1. ----- -#static Command_Builder "PeriodicSupplier -Create s_low -Direct c_low_relay -EventType L -Priority 1 -Period 0 -Iter 50000 -Load 1 -RunTime 40" - -### --- Create Supplier s2 connected to sa1 ---- -#static Command_Builder "PeriodicSupplier -Create s_med -Direct c_med_relay -EventType M -Priority 2 -Period 0 -Iter 50000 -Load 1 -RunTime 40" - -### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Direct c_high_relay -EventType H -Priority 90 -Period 0 -Iter 50000 -Load 0 -RunTime 15" +### --- Create Supplier connected to sa1 ---- +static Command_Builder "PeriodicSupplier -Create s_high -Direct c_high_relay -EventType H -Priority 1 -Period 0 -Iter 50000 -Load 0 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -SignalPeer" @@ -39,4 +23,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/consumer.conf index 0db0b8a5c88..2af45e411ee 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/consumer.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/consumer.conf @@ -1,4 +1,9 @@ ## $Id$ +## +# +# Note that this test is not portable because it does not use RTCORBA. +# All priority values are for Linux +# ##---- Load the Factories------ dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -10,12 +15,6 @@ dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests ##------- Init the Application Object ---------- static Command_Builder "Application -Init" -##--------- Consumer 1 , connected to CA 1 -------- -#static Command_Builder "PeriodicConsumer -Create c_low -Direct" - -##--------- Consumer 2 , connected to CA 1 -------- -#static Command_Builder "PeriodicConsumer -Create c_med -Direct" - ##--------- Consumer 3 , connected to CA 1 -------- static Command_Builder "PeriodicConsumer -Create c_high -Direct" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/relay.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/relay.conf index ca2eef8baa8..9f4c913cee4 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/relay.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/relay.conf @@ -1,4 +1,9 @@ ## $Id$ +## +# +# Note that this test is not portable because it does not use RTCORBA. +# All priority values are for Linux +# ##---- Load the Factories------ dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -10,12 +15,6 @@ dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests ##------- Init the Application Object ---------- static Command_Builder "Application -Init" -##--------- Consumer 1 , connected to CA 1 -------- -#static Command_Builder "PeriodicConsumer -Create c_low_relay -Relay c_low" - -##--------- Consumer 2 , connected to CA 1 -------- -#static Command_Builder "PeriodicConsumer -Create c_med_relay -Relay c_med" - ##--------- Consumer 3 , connected to CA 1 -------- static Command_Builder "PeriodicConsumer -Create c_high_relay -Relay c_high" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/supplier.conf index d44991d0bd9..365519d4bb2 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/supplier.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/supplier.conf @@ -1,6 +1,9 @@ ## $Id$ -## - +## +# +# Note that this test is not portable because it does not use RTCORBA. +# All priority values are for Linux +# ##---- Load the Factories------ dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -11,14 +14,8 @@ dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests ##------- Init the Application Object ---------- static Command_Builder "Application -Init" -### --- Create Supplier s1 connected to sa1. ----- -#static Command_Builder "PeriodicSupplier -Create s_low -Direct c_low_relay -EventType L -Priority 1 -Period 0 -Iter 50000 -Load 1 -RunTime 40" - -### --- Create Supplier s2 connected to sa1 ---- -#static Command_Builder "PeriodicSupplier -Create s_med -Direct c_med_relay -EventType M -Priority 2 -Period 0 -Iter 50000 -Load 1 -RunTime 40" - ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Direct c_high_relay -EventType H -Priority 90 -Period 0 -Iter 50000 -Load 0 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Direct c_high_relay -EventType H -Priority 2 -Period 0 -Iter 50000 -Load 0 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -SignalPeer" @@ -26,4 +23,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - 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 d65da00875d..b6406954e9c 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 @@ -1,6 +1,6 @@ ## $Id$ ##---- Load the Factories------ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () "" ##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -14,14 +14,7 @@ dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_T 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" - - -##--------- Consumer 1 , connected to CA 1 -------- -#static Command_Builder "PeriodicConsumer -Create c_low -Direct -POA poa_1" - -##--------- Consumer 2 , connected to CA 1 -------- -#static Command_Builder "PeriodicConsumer -Create c_med -Direct -POA poa_1" +static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -ThreadPoolLanes 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 b15e8ec7212..216629f1fde 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,14 +14,7 @@ dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_T 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" - - -##--------- Consumer 1 , connected to CA 1 -------- -#static Command_Builder "PeriodicConsumer -Create c_low_relay -Relay c_low -POA poa_1" - -##--------- Consumer 2 , connected to CA 1 -------- -#static Command_Builder "PeriodicConsumer -Create c_med_relay -Relay c_med -POA poa_1" +static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -ThreadPoolLanes 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/3_Hops_RTCORBA/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/supplier.conf index 5039bbb1f0b..888f8ee6c17 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/supplier.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/supplier.conf @@ -1,9 +1,9 @@ ## $Id$ ## This file has the following configuration: -## +## ##---- Load the Factories------ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () "" ##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -15,14 +15,8 @@ dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests ##------- Init the Application Object ---------- static Command_Builder "Application -Init" -### --- Create Supplier s1 connected to sa1. ----- -#static Command_Builder "PeriodicSupplier -Create s_low -Direct c_low_relay -EventType L -Priority 1 -Period 0 -Iter 50000 -Load 1 -RunTime 40" - -### --- Create Supplier s2 connected to sa1 ---- -#static Command_Builder "PeriodicSupplier -Create s_med -Direct c_med_relay -EventType M -Priority 2 -Period 0 -Iter 50000 -Load 1 -RunTime 40" - ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Direct c_high_relay -EventType H -Priority 90 -Period 0 -Iter 50000 -Load 0 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Direct c_high_relay -EventType H -Priority 1 -Period 0 -Iter 50000 -Load 0 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -SignalPeer" @@ -30,4 +24,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf index 6b919f91233..336b0ff1186 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf @@ -1,6 +1,9 @@ #$Id$ - -dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () "" +# +# Note that this test is not portable because it does not use RTCORBA. +# All priority values are for Linux +# +dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () "" ##---- Load the Factories------ @@ -23,13 +26,13 @@ static Command_Builder "Application -Init" static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory COLOCATED" ### -### Configure Supplier and Consumer for the High Priority Path +### Configure Supplier and Consumer for the High Priority Path ### ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa_high ec1 -AND_OP" ### --- Create Supplier s_high connected to sa_high ----- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa_high -EventType H -Priority 90 -Iter 50000 -Load 0 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa_high -EventType H -Priority 2 -Iter 50000 -Load 0 -RunTime 15" ##--------- Consumer Admin 1 ------------- static Command_Builder "ConsumerAdmin -Create ca_high ec1 -AND_OP" 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 1d6d6b10f49..51040c059e2 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 @@ -1,10 +1,10 @@ #$Id$ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" -dynamic TAO_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_Default_Factory () "" +dynamic TAO_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_Default_Factory () "" -dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () "" +dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () "" ##---- Load the Factories------ @@ -27,19 +27,19 @@ static Command_Builder "Application -Init" ##------- Create Event Channel --------------- static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory COLOCATED" -static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 1 1 0 -Lane 90 1 0" +static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 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 1 1 0 -Lane 90 1 0" +static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 1 1 0" ### -### Configure Supplier and Consumer for the High Priority Path +### Configure Supplier and Consumer for the High Priority Path ### ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa_high ec1 -AND_OP" ### --- Create Supplier s_high connected to sa_high ----- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa_high -EventType H -Priority 90 -Iter 50000 -Load 0 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa_high -EventType H -Priority 1 -Iter 50000 -Load 0 -RunTime 15" ##--------- Consumer Admin 1 ------------- static Command_Builder "ConsumerAdmin -Create ca_high ec1 -AND_OP" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/consumer.conf index 6cd28ac09aa..2a2c6d45b9e 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/consumer.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/consumer.conf @@ -1,4 +1,8 @@ ## $Id$ +# +# Note that this test is not portable because it does not use RTCORBA. +# All priority values are for Linux +# ##---- Load the Factories------ dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -12,15 +16,7 @@ static Command_Builder "Application -Init" ##--------- Consumer Admin 1 ------------- static Command_Builder "ConsumerAdmin -Create ca1 ec1 -AND_OP" -##--------- Consumer 1 , connected to CA 1 -------- -#static Command_Builder "PeriodicConsumer -Create c_low -Admin ca1" -#static Command_Builder "PeriodicConsumer -Subscription c_low +L" - -##--------- Consumer 2 , connected to CA 1 -------- -#static Command_Builder "PeriodicConsumer -Create c_med -Admin ca1" -#static Command_Builder "PeriodicConsumer -Subscription c_med +M" - -##--------- Consumer 3 , connected to CA 1 -------- +##--------- Consumer , connected to CA 1 -------- static Command_Builder "PeriodicConsumer -Create c_high -Admin ca1" static Command_Builder "PeriodicConsumer -Subscription c_high +H" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/supplier.conf index 4f5b6b6da36..f2edafed29c 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/supplier.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/supplier.conf @@ -1,6 +1,9 @@ ## $Id$ -## - +## +# +# Note that this test is not portable because it does not use RTCORBA. +# All priority values are for Linux +# ##---- Load the Factories------ dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -19,14 +22,8 @@ static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" -### --- Create Supplier s1 connected to sa1. ----- -#static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 30 -RunTime 15" - -### --- Create Supplier s2 connected to sa1 ---- -#static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 30 -RunTime 15" - -### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 0 -Iter 50000 -Load 0 -RunTime 15" +### --- Create Supplier connected to sa1 ---- +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 2 -Period 0 -Iter 50000 -Load 0 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -34,4 +31,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/consumer.conf index 9a36f37dea7..e4ba0495b9f 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/consumer.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/consumer.conf @@ -1,6 +1,6 @@ ## $Id$ ##---- Load the Factories------ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () "" ##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -14,19 +14,11 @@ dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_T static Command_Builder "Application -Init" ##----------- Create an RT POA to host local consumer objects----------- -static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -Lanes 5 -Lane 1 1 0 -Lane 50 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 2 -Lane 0 1 0 -Lane 1 1 0" ##--------- Consumer Admin 1 ------------- static Command_Builder "ConsumerAdmin -Create ca1 ec1 -AND_OP" -##--------- Consumer 1 , connected to CA 1 -------- -#static Command_Builder "PeriodicConsumer -Create c_low -Admin ca1 -POA poa_1" -#static Command_Builder "PeriodicConsumer -Subscription c_low +L" - -##--------- Consumer 2 , connected to CA 1 -------- -#static Command_Builder "PeriodicConsumer -Create c_med -Admin ca1 -POA poa_1" -#static Command_Builder "PeriodicConsumer -Subscription c_med +M" - ##--------- Consumer 3 , connected to CA 1 -------- static Command_Builder "PeriodicConsumer -Create c_high -Admin ca1 -POA poa_1" static Command_Builder "PeriodicConsumer -Subscription c_high +H" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf index c2c8a049a4b..d7e0083e0eb 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf @@ -1,4 +1,3 @@ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" -dynamic TAO_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_Default_Factory () "" -dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () "" - +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" +dynamic TAO_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_Default_Factory () "" +dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () "" 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 a81ae0ebc66..a4222ec5346 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 @@ -1,17 +1,8 @@ ## $Id$ -## This file has the following configuration: -## EventChannel ec1 with 1 Thread -## SupplierAdmim sa1 with 1 Thread -## SupplierAdmin sa2 -## -## Supplier s1 has 1 Thread and is connected to sa1 -## Supplier s2 is connected to sa1 -## -## Supplier s3 is connected to sa2 -## +## ##---- Load the Factories------ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct" +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () "" ##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () "" @@ -25,19 +16,13 @@ static Command_Builder "Application -Init" ##------- Create Event Channel --------------- static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory" -static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0" +static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 1 1 0" ### --- Create Supplier Admin 1 ---- static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP" -### --- Create Supplier s1 connected to sa1. ----- -#static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 30 -RunTime 15" - -### --- Create Supplier s2 connected to sa1 ---- -#static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 30 -RunTime 15" - ### --- Create Supplier s3 connected to sa1 ---- -static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 0 -Iter 5 -Load 0 -RunTime 15" +static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 1 -Period 0 -Iter 5 -Load 0 -RunTime 15" ##--------- Run ------------- static Command_Builder "Application -WaitToStart" @@ -45,4 +30,3 @@ static Command_Builder "Application -Run" static Command_Builder "Application -WaitForEvents" static Command_Builder "Application -DumpStats" static Command_Builder "Application -Shutdown" - diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/README b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/README index a0195aac85b..09cf8f1f006 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/README +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/README @@ -1,22 +1,24 @@ //$Id$ -To calculate the Maximum throughput possible, a supplier thread sends +To calculate the Maximum throughput possible, a supplier thread sends events in a burst to a consumer. This test runs the following configurations: Note that the payload is identical in all configurations. +Also beware that the priority values in these tests are for Linux. +These cannot be made portable as they do not use RTCORBA. 1. 2 Hops : A supplier sends events directly to a consumer. 2. 3 Hops : A supplier sends events to a relay consumer onto the final consummer. 3. Notify : A supplier sends events via Cos Notification to a consumer. -4. Colocated : A supplier sends events via a colocated +4. Colocated : A supplier sends events via a colocated RT Notification to a consumer. The RTCORBA enabled versions of these tests are: -2_Hops_RTCORBA -3_Hops_RTCORBA -Notify_RTCORBA -Colocated_RTCORBA +2_Hops_RTCORBA +3_Hops_RTCORBA +Notify_RTCORBA +Colocated_RTCORBA |