summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-08-12 19:32:21 +0000
committerirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-08-12 19:32:21 +0000
commit46cb36a6b16c67cfae56ab0433994865e4db6015 (patch)
tree69316a003b698e2ea8d1007aefe30bec00fcefa7
parentca2d0e4039fa5f3ff74f24e5b5af233aa7662d31 (diff)
downloadATCD-46cb36a6b16c67cfae56ab0433994865e4db6015.tar.gz
Changed this example to use Thread Pools rather than the old Thread-per-Priority scheme.
-rwxr-xr-xTAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl7
-rw-r--r--TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.conf1
-rw-r--r--TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp8
3 files changed, 2 insertions, 14 deletions
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
index 658c2db8baf..e814c7a31ba 100755
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
@@ -45,12 +45,7 @@ $server_conf = PerlACE::LocalFile ("server.conf");
$server_args =
"-o $iorfile -ORBdebuglevel 1 -ORBsvcconf $server_conf "
- ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=$priority1 "
- ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=$priority2 "
- ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=$priority3 "
- ."-ORBendpoint shmiop://0/priority=$priority1 "
- ."-ORBendpoint shmiop://0/priority=$priority2 "
- ."-ORBendpoint shmiop://0/priority=$priority3 ";
+ ."-ORBendpoint iiop:// -ORBendpoint shmiop:// ";
$client_args =
"-o file://$iorfile "
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.conf b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.conf
index 60522fde328..5283fee5eec 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.conf
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.conf
@@ -1,5 +1,4 @@
# $Id$
#
dynamic SHMIOP_Factory Service_Object *TAO_Strategies:_make_TAO_SHMIOP_Protocol_Factory () "-MMAPFilePrefix server_shmiop "
-static Advanced_Resource_Factory "-ORBReactorType tp -ORBReactorRegistry per-priority"
static RT_ORB_Loader ""
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
index d8d1550ae02..a95fc4c0462 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
@@ -3,7 +3,6 @@
#include "testS.h"
#include "ace/Get_Opt.h"
#include "tao/RTCORBA/RTCORBA.h"
-#include "tao/RTCORBA/Pool_Per_Endpoint.h"
#include "tao/Strategies/advanced_resource.h"
@@ -180,11 +179,7 @@ main (int argc, char *argv[])
ACE_TRY_CHECK;
// Start ORB event loop.
- // @@ Currently we are using Reactor per priority to emulate
- // threadpool with lanes. Once POA threadpools are implemented,
- // this code should be replaced with standard threadpool apis.
- TAO_Pool_Per_Endpoint pool (orb.in ());
- pool.run (ACE_TRY_ENV);
+ orb->run (ACE_TRY_ENV);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n"));
@@ -199,4 +194,3 @@ main (int argc, char *argv[])
return 0;
}
-