diff options
Diffstat (limited to 'TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp')
| -rw-r--r-- | TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp | 80 |
1 files changed, 28 insertions, 52 deletions
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp index ba8896407be..dc7076250bf 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp @@ -75,16 +75,13 @@ parse_args (int argc, char *argv[]) CORBA::Object_ptr join_object_group (CORBA::ORB_ptr orb, CosLoadBalancing::LoadManager_ptr lm, - const PortableGroup::Location & location - ACE_ENV_ARG_DECL) + const PortableGroup::Location & location) { CORBA::Object_var ns_object = - orb->resolve_initial_references ("NameService" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("NameService"); CosNaming::NamingContext_var nc = - CosNaming::NamingContext::_narrow (ns_object.in () - ACE_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (ns_object.in ()); CosNaming::Name name (1); name.length (1); @@ -94,12 +91,11 @@ join_object_group (CORBA::ORB_ptr orb, CORBA::Object_var group; - ACE_TRY + try { - group = nc->resolve (name - ACE_ENV_ARG_PARAMETER); + group = nc->resolve (name); } - ACE_CATCH (CosNaming::NamingContext::NotFound, ex) + catch (const CosNaming::NamingContext::NotFound& ) { // Object group not created. Create one. const char repository_id[] = "IDL:Test/Roundtrip:1.0"; @@ -121,15 +117,12 @@ join_object_group (CORBA::ORB_ptr orb, group = lm->create_object (repository_id, criteria, - fcid.out () - ACE_ENV_ARG_PARAMETER); + fcid.out ()); - ACE_TRY_EX (foo) + try { nc->bind (name, - group.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (foo); + group.in ()); PortableGroup::Properties props (1); props.length (1); @@ -191,24 +184,17 @@ join_object_group (CORBA::ORB_ptr orb, props[0].val <<= strategy_info; - lm->set_default_properties (props - ACE_ENV_ARG_PARAMETER); + lm->set_default_properties (props); } - ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex) + catch (const CosNaming::NamingContext::AlreadyBound& ) { // Somebody beat us to creating the object group. Clean up // the one we created. - lm->delete_object (fcid.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (foo); + lm->delete_object (fcid.in ()); - group = nc->resolve (name - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (foo); + group = nc->resolve (name); } - ACE_ENDTRY; } - ACE_ENDTRY; Roundtrip * roundtrip_impl; ACE_NEW_THROW_EX (roundtrip_impl, @@ -222,8 +208,7 @@ join_object_group (CORBA::ORB_ptr orb, group = lm->add_member (group.in (), location, - roundtrip.in () - ACE_ENV_ARG_PARAMETER); + roundtrip.in ()); return group._retn (); } @@ -253,7 +238,7 @@ main (int argc, char *argv[]) "server (%P|%t): sched_params failed\n")); } - ACE_TRY_NEW_ENV + try { ORBInitializer *initializer = 0; ACE_NEW_RETURN (initializer, @@ -262,16 +247,14 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -279,8 +262,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -291,12 +273,10 @@ main (int argc, char *argv[]) poa_manager->activate (); CORBA::Object_var lm_object = - orb->resolve_initial_references ("LoadManager" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("LoadManager"); CosLoadBalancing::LoadManager_var load_manager = - CosLoadBalancing::LoadManager::_narrow (lm_object.in () - ACE_ENV_ARG_PARAMETER); + CosLoadBalancing::LoadManager::_narrow (lm_object.in ()); RPS_Monitor * monitor_servant; ACE_NEW_THROW_EX (monitor_servant, @@ -314,8 +294,7 @@ main (int argc, char *argv[]) CORBA::Object_var roundtrip = ::join_object_group (orb.in (), load_manager.in (), - location.in () - ACE_ENV_ARG_PARAMETER); + location.in ()); TAO_LB_LoadAlert & alert_servant = initializer->load_alert (); @@ -324,7 +303,7 @@ main (int argc, char *argv[]) CORBA::String_var ior = - orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (roundtrip.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -337,27 +316,24 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); load_manager->register_load_monitor (location.in (), - load_monitor.in () - ACE_ENV_ARG_PARAMETER); + load_monitor.in ()); load_manager->register_load_alert (location.in (), - load_alert.in () - ACE_ENV_ARG_PARAMETER); + load_alert.in ()); orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } |