diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-02-11 11:33:12 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-02-11 11:33:12 +0000 |
| commit | 4df04cc27ef1e77bcc941afaba7d4c943b98a936 (patch) | |
| tree | 5054c2bde24d048d4790ff659b61be0838cd0d69 /TAO/orbsvcs/performance-tests | |
| parent | b723802f85ac66026a503827677a2fb1e9a77933 (diff) | |
| download | ATCD-4df04cc27ef1e77bcc941afaba7d4c943b98a936.tar.gz | |
Fri Feb 11 11:16:00 UTC 2011 Martin Corino <mcorino@remedy.nl>
Merged changes from Remedy work branch.
Diffstat (limited to 'TAO/orbsvcs/performance-tests')
3 files changed, 6 insertions, 6 deletions
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/svc.conf.xml b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/svc.conf.xml index 5b2a58bb6f0..51612b28d17 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/svc.conf.xml +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/svc.conf.xml @@ -5,6 +5,6 @@ <!-- $Id$ --> <!-- --> <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/> - <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/> - <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBClientConnectionHandler RW"/> + <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/> + <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"/> </ACE_Svc_Conf> diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf index 9e0c5ed01ed..40babaf2989 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf @@ -2,5 +2,5 @@ # $Id$ # static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null" -static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0" -static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBClientConnectionHandler RW" +static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0" +static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW" diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf.xml b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf.xml index 5b2a58bb6f0..51612b28d17 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf.xml +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf.xml @@ -5,6 +5,6 @@ <!-- $Id$ --> <!-- --> <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/> - <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/> - <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBClientConnectionHandler RW"/> + <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/> + <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"/> </ACE_Svc_Conf> |