diff options
Diffstat (limited to 'TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf')
13 files changed, 32 insertions, 110 deletions
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp index a7d70ac5c85..a8c5085b91a 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp @@ -37,14 +37,12 @@ ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var safe_reject_interceptor = reject_interceptor; info->add_server_request_interceptor (safe_reject_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp index 004cd30266a..c9ee46f95bc 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp @@ -40,7 +40,7 @@ Roundtrip::test_method (Test::Timestamp send_time, } void -Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Roundtrip::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h index 6cd4e89a956..3ef3babc13a 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h @@ -27,7 +27,7 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp index b68487ba367..b9d71afb69a 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp @@ -73,7 +73,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - + int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; @@ -98,18 +98,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Roundtrip_var roundtrip = Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (roundtrip.in ())) { @@ -123,7 +120,6 @@ main (int argc, char *argv[]) { ACE_hrtime_t start = 0; (void) roundtrip->test_method (start, number ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_Sample_History history (niterations); @@ -149,7 +145,6 @@ main (int argc, char *argv[]) (void) roundtrip->test_method (start, number ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_hrtime_t now = ACE_OS::gethrtime (); history.sample (now - start); @@ -179,8 +174,7 @@ main (int argc, char *argv[]) if (do_shutdown) { - roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + roundtrip->shutdown (); } } ACE_CATCHANY diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp index ed3756bffbe..cbfdc4b9066 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp @@ -78,12 +78,10 @@ join_object_group (CORBA::ORB_ptr orb, CORBA::Object_var ns_object = orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); CosNaming::NamingContext_var nc = CosNaming::NamingContext::_narrow (ns_object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); CosNaming::Name name (1); name.length (1); @@ -97,7 +95,6 @@ join_object_group (CORBA::ORB_ptr orb, { group = nc->resolve (name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CosNaming::NamingContext::NotFound, ex) { @@ -123,7 +120,6 @@ join_object_group (CORBA::ORB_ptr orb, criteria, fcid.out () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_TRY_EX (foo) { @@ -194,7 +190,6 @@ join_object_group (CORBA::ORB_ptr orb, lm->set_default_properties (props ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex) { @@ -209,28 +204,23 @@ join_object_group (CORBA::ORB_ptr orb, ACE_TRY_CHECK_EX (foo); } ACE_ENDTRY; - ACE_TRY_CHECK; } ACE_ENDTRY; - ACE_CHECK_RETURN (CORBA::Object::_nil ()); Roundtrip * roundtrip_impl; ACE_NEW_THROW_EX (roundtrip_impl, Roundtrip (orb), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var owner_transfer (roundtrip_impl); Test::Roundtrip_var roundtrip = - roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + roundtrip_impl->_this (); group = lm->add_member (group.in (), location, roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); return group._retn (); } @@ -238,7 +228,7 @@ join_object_group (CORBA::ORB_ptr orb, int main (int argc, char *argv[]) { - + int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; @@ -261,7 +251,7 @@ main (int argc, char *argv[]) "server (%P|%t): sched_params failed\n")); } - + ACE_TRY_NEW_ENV { @@ -274,17 +264,14 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -294,60 +281,49 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); CORBA::Object_var lm_object = orb->resolve_initial_references ("LoadManager" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CosLoadBalancing::LoadManager_var load_manager = CosLoadBalancing::LoadManager::_narrow (lm_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_LB_CPU_Utilization_Monitor * monitor_servant; ACE_NEW_THROW_EX (monitor_servant, TAO_LB_CPU_Utilization_Monitor, CORBA::NO_MEMORY ()); - ACE_TRY_CHECK; PortableServer::ServantBase_var safe_monitor_servant (monitor_servant); CosLoadBalancing::LoadMonitor_var load_monitor = - monitor_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + monitor_servant->_this (); PortableGroup::Location_var location = - load_monitor->the_location (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + load_monitor->the_location (); CORBA::Object_var roundtrip = ::join_object_group (orb.in (), load_manager.in (), location.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_LB_LoadAlert & alert_servant = initializer->load_alert (); CosLoadBalancing::LoadAlert_var load_alert = - alert_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + alert_servant._this (); CORBA::String_var ior = orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -362,23 +338,18 @@ main (int argc, char *argv[]) load_manager->register_load_monitor (location.in (), load_monitor.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; load_manager->register_load_alert (location.in (), load_alert.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp index 6ebd0450558..b421b7feb6a 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp @@ -37,14 +37,12 @@ ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var sr_interceptor = this->interceptor_; info->add_server_request_interceptor (sr_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_ptr reject_interceptor; ACE_NEW_THROW_EX (reject_interceptor, @@ -54,14 +52,12 @@ ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var safe_reject_interceptor = reject_interceptor; info->add_server_request_interceptor (safe_reject_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp index 1a640f3cbf7..a9ea95abd62 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp @@ -30,7 +30,7 @@ RPS_Monitor::~RPS_Monitor (void) } CosLoadBalancing::Location * -RPS_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL) +RPS_Monitor::the_location (void) ACE_THROW_SPEC ((CORBA::SystemException)) { CosLoadBalancing::Location * location; @@ -41,13 +41,12 @@ RPS_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL) TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); return location; } CosLoadBalancing::LoadList * -RPS_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL) +RPS_Monitor::loads (void) ACE_THROW_SPEC ((CORBA::SystemException)) { const ACE_Time_Value current_time = ACE_OS::gettimeofday (); @@ -72,7 +71,6 @@ RPS_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL) TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); CosLoadBalancing::LoadList_var load_list = tmp; diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp index 9a6a6ccd10e..dceba1eea0f 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp @@ -17,7 +17,7 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb) Test::Timestamp Roundtrip::test_method (Test::Timestamp send_time, - Test::number cl_number + Test::number cl_number ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -34,7 +34,7 @@ Roundtrip::test_method (Test::Timestamp send_time, } void -Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Roundtrip::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h index 6cd4e89a956..3ef3babc13a 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h @@ -27,7 +27,7 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp index bba0ca52470..2f8d5ab91cb 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp @@ -14,14 +14,14 @@ ServerRequestInterceptor::~ServerRequestInterceptor (void) } char * -ServerRequestInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ServerRequestInterceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("ServerRequestInterceptor"); } void -ServerRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ServerRequestInterceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h index 1e85d70efd2..6e350ceb444 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h @@ -60,10 +60,10 @@ public: * ServerRequestInterceptors. */ //@{ - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp index 94221caa7bd..abd035a418e 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp @@ -98,18 +98,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Roundtrip_var roundtrip = Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (roundtrip.in ())) { @@ -122,7 +119,6 @@ main (int argc, char *argv[]) { ACE_hrtime_t start = 0; (void) roundtrip->test_method (start, number ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_Sample_History history (niterations); @@ -148,7 +144,6 @@ main (int argc, char *argv[]) (void) roundtrip->test_method (start, number ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_hrtime_t now = ACE_OS::gethrtime (); history.sample (now - start); @@ -178,8 +173,7 @@ main (int argc, char *argv[]) if (do_shutdown) { - roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + roundtrip->shutdown (); } } ACE_CATCHANY diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp index f6ce3d00373..ba8896407be 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp @@ -81,12 +81,10 @@ join_object_group (CORBA::ORB_ptr orb, CORBA::Object_var ns_object = orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); CosNaming::NamingContext_var nc = CosNaming::NamingContext::_narrow (ns_object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); CosNaming::Name name (1); name.length (1); @@ -100,7 +98,6 @@ join_object_group (CORBA::ORB_ptr orb, { group = nc->resolve (name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CosNaming::NamingContext::NotFound, ex) { @@ -126,7 +123,6 @@ join_object_group (CORBA::ORB_ptr orb, criteria, fcid.out () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_TRY_EX (foo) { @@ -197,7 +193,6 @@ join_object_group (CORBA::ORB_ptr orb, lm->set_default_properties (props ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex) { @@ -212,28 +207,23 @@ join_object_group (CORBA::ORB_ptr orb, ACE_TRY_CHECK_EX (foo); } ACE_ENDTRY; - ACE_TRY_CHECK; } ACE_ENDTRY; - ACE_CHECK_RETURN (CORBA::Object::_nil ()); Roundtrip * roundtrip_impl; ACE_NEW_THROW_EX (roundtrip_impl, Roundtrip (orb), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var owner_transfer (roundtrip_impl); Test::Roundtrip_var roundtrip = - roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + roundtrip_impl->_this (); group = lm->add_member (group.in (), location, roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); return group._retn (); } @@ -274,17 +264,14 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -294,61 +281,50 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); CORBA::Object_var lm_object = orb->resolve_initial_references ("LoadManager" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CosLoadBalancing::LoadManager_var load_manager = CosLoadBalancing::LoadManager::_narrow (lm_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RPS_Monitor * monitor_servant; ACE_NEW_THROW_EX (monitor_servant, RPS_Monitor (initializer->interceptor ()), CORBA::NO_MEMORY ()); - ACE_TRY_CHECK; PortableServer::ServantBase_var safe_monitor_servant (monitor_servant); CosLoadBalancing::LoadMonitor_var load_monitor = - monitor_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + monitor_servant->_this (); PortableGroup::Location_var location = - load_monitor->the_location (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + load_monitor->the_location (); CORBA::Object_var roundtrip = ::join_object_group (orb.in (), load_manager.in (), location.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_LB_LoadAlert & alert_servant = initializer->load_alert (); CosLoadBalancing::LoadAlert_var load_alert = - alert_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + alert_servant._this (); CORBA::String_var ior = orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -363,23 +339,18 @@ main (int argc, char *argv[]) load_manager->register_load_monitor (location.in (), load_monitor.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; load_manager->register_load_alert (location.in (), load_alert.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { |