diff options
Diffstat (limited to 'TAO/orbsvcs/performance-tests')
68 files changed, 195 insertions, 463 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 { diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp index 280e7ba2efa..cd50b2cd388 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp @@ -45,7 +45,6 @@ int main (int argc, char *argv[]) { ORB_Holder orb (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client_Options options (argc, argv); if (argc != 1) @@ -71,20 +70,16 @@ int main (int argc, char *argv[]) rt_class, 1 // options.nthreads ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = RIR_Narrow<PortableServer::POA>::resolve (orb, "RootPOA" 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 (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); PortableServer::POA_var ec_poa (rtserver_setup.poa ()); @@ -105,24 +100,19 @@ int main (int argc, char *argv[]) rtserver_setup.rtcorba_setup () ACE_ENV_ARG_PARAMETER) ); - ACE_TRY_CHECK; - ec_impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec_impl->activate (); PortableServer::ObjectId_var ec_id = ec_poa->activate_object (ec_impl.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var ec_object = ec_poa->id_to_reference (ec_id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var ec = RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; EC_Destroyer ec_destroyer (ec.in ()); @@ -163,7 +153,6 @@ int main (int argc, char *argv[]) { high_priority_group.connect (ec.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; high_priority_disconnect = &high_priority_group; } @@ -193,7 +182,6 @@ int main (int argc, char *argv[]) { high_priority_group.connect (ec.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; high_priority_disconnect = &high_priority_group; } Send_Task high_priority_task; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp index 8720b8bb599..2c2c4b42538 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp @@ -137,7 +137,6 @@ int main (int argc, char *argv[]) { ORB_Holder orb (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -147,20 +146,16 @@ int main (int argc, char *argv[]) rt_class, nthreads ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = RIR_Narrow<PortableServer::POA>::resolve (orb, "RootPOA" 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 (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); ACE_DEBUG ((LM_DEBUG, "Finished ORB and POA configuration\n")); @@ -170,29 +165,23 @@ int main (int argc, char *argv[]) rt_class ACE_ENV_ARG_PARAMETER) ); - ACE_TRY_CHECK; Federated_Test::Peer_var peer = - peer_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + peer_impl->_this (); ACE_DEBUG ((LM_DEBUG, "Finished peer configuration and activation\n")); CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Federated_Test::Control_var control = Federated_Test::Control::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; control->join (peer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); } ACE_CATCHANY { @@ -243,7 +232,6 @@ Roundtrip_Peer::run_experiment (CORBA::Long experiment_id, this->event_channel_.in (), &the_barrier ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); #endif Client_Pair high_priority_group; @@ -256,7 +244,6 @@ Roundtrip_Peer::run_experiment (CORBA::Long experiment_id, this->poa_.in ()); high_priority_group.connect (this->event_channel_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); Auto_Disconnect<Client_Pair> high_priority_disconnect (&high_priority_group); Send_Task high_priority_task; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp index 677cf6870f5..5e8e6e8f462 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp @@ -84,7 +84,6 @@ int main (int argc, char *argv[]) { ORB_Holder orb (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -94,20 +93,16 @@ int main (int argc, char *argv[]) rt_class, nthreads ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = RIR_Narrow<PortableServer::POA>::resolve (orb, "RootPOA" 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 (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); PortableServer::POA_var control_poa (rtserver_setup.poa ()); Servant_var<Control> control_impl ( @@ -119,12 +114,10 @@ int main (int argc, char *argv[]) ); Federated_Test::Control_var control = - control_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + control_impl->_this (); CORBA::String_var ior = orb->object_to_string (control.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the ior to the <ior_output_file> FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); @@ -136,11 +129,9 @@ int main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp index d4ef62e9781..0a3e935184a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp @@ -4,8 +4,8 @@ #include "Roundtrip.h" #include "ace/High_Res_Timer.h" -ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Baseline, - Roundtrip, +ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Baseline, + Roundtrip, "$Id$") Roundtrip::Roundtrip (CORBA::ORB_ptr orb) @@ -22,7 +22,7 @@ Roundtrip::test_method (Test::Timestamp send_time, { ACE_hrtime_t start = ACE_OS::gethrtime (); CORBA::Long elapsed = 0; - + while (elapsed < workload_in_usecs) { elapsed = @@ -30,12 +30,12 @@ Roundtrip::test_method (Test::Timestamp send_time, (ACE_OS::gethrtime () - start) / this->gsf_ ); } - + return 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/RTEvent/RTCORBA_Baseline/Roundtrip.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h index a4b01ce89b1..9f6947e047e 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h @@ -22,7 +22,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/RTEvent/RTCORBA_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp index a3caafe3b54..8a6664016af 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp @@ -34,7 +34,7 @@ public: { } - virtual void run_test (ACE_ENV_SINGLE_ARG_DECL) = 0; + virtual void run_test (void) = 0; virtual int svc (void) { @@ -42,8 +42,7 @@ public: ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->run_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->run_test (); } ACE_CATCHANY { @@ -76,7 +75,7 @@ public: { } - virtual void run_test (ACE_ENV_SINGLE_ARG_DECL) + virtual void run_test (void) { for (int i = 0; i != this->iterations_; ++i) { @@ -88,7 +87,6 @@ public: (void) this->roundtrip_->test_method (start, this->workload_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_hrtime_t elapsed = ACE_OS::gethrtime () - start; this->sample_history.sample (elapsed); @@ -128,7 +126,7 @@ public: this->stopped_ = 1; } - virtual void run_test (ACE_ENV_SINGLE_ARG_DECL) + virtual void run_test (void) { for (;;) { @@ -146,7 +144,6 @@ public: (void) this->roundtrip_->test_method (dummy, this->workload_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { } ACE_ENDTRY; @@ -171,7 +168,6 @@ int main (int argc, char *argv[]) { ORB_Holder orb (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client_Options options (argc, argv); if (argc != 1) @@ -197,23 +193,19 @@ int main (int argc, char *argv[]) rt_class, options.nthreads ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Finished ORB and POA configuration\n")); CORBA::Object_var object = orb->string_to_object (options.ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Roundtrip_var roundtrip = Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyList_var inconsistent_policies; (void) roundtrip->_validate_connection (inconsistent_policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int thread_count = 1 + options.nthreads; ACE_Barrier the_barrier (thread_count); @@ -263,8 +255,7 @@ int main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - all task(s) joined\n")); - roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + roundtrip->shutdown (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - starting cleanup\n")); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp index f82199ba24e..01059c47fcc 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp @@ -67,7 +67,6 @@ int main (int argc, char *argv[]) { ORB_Holder orb (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -77,20 +76,16 @@ int main (int argc, char *argv[]) rt_class, nthreads ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = RIR_Narrow<PortableServer::POA>::resolve (orb, "RootPOA" 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 (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); PortableServer::POA_var the_poa (rtserver_setup.poa ()); @@ -99,16 +94,13 @@ int main (int argc, char *argv[]) PortableServer::ObjectId_var id = the_poa->activate_object (roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var object = the_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the ior to the <ior_output_file> FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); @@ -120,8 +112,7 @@ int main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp index 134dc30f9b3..4a4350c98c0 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp @@ -5,8 +5,8 @@ #include "Implicit_Deactivator.h" #include "ace/OS_NS_time.h" -ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback, - Callback, +ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback, + Callback, "$Id$") Callback::Callback (int iterations, @@ -36,7 +36,7 @@ Callback::sample (Test::Timestamp the_timestamp } PortableServer::POA_ptr -Callback::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Callback::_default_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h index 520895f1cab..6e1e0a33af5 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h @@ -40,7 +40,7 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + PortableServer::POA_ptr _default_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp index 5c7627717eb..7e320974dcb 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp @@ -4,8 +4,8 @@ #include "Session.h" #include "Implicit_Deactivator.h" -ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback, - Session, +ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback, + Session, "$Id$") Session::Session (Test::Callback_ptr cb, @@ -25,7 +25,7 @@ Session::sample (Test::Timestamp the_timestamp } void -Session::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Session::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { Implicit_Deactivator deactivator (this @@ -33,7 +33,7 @@ Session::shutdown (ACE_ENV_SINGLE_ARG_DECL) } PortableServer::POA_ptr -Session::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Session::_default_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h index 65d8f4b6507..2b00c6ce028 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h @@ -22,10 +22,10 @@ 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)); - virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual PortableServer::POA_ptr _default_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp index 735a8d0ec84..02df9d17977 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp @@ -5,8 +5,8 @@ #include "Session.h" #include "Servant_var.h" -ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback, - Session_Factory, +ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback, + Session_Factory, "$Id$") Session_Factory::Session_Factory (CORBA::ORB_ptr orb, @@ -24,18 +24,18 @@ Session_Factory::create_new_session (Test::Callback_ptr cb Servant_var<Session> session_impl (new Session (cb, this->poa_.in ())); - return session_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + return session_impl->_this (); } void -Session_Factory::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Session_Factory::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } PortableServer::POA_ptr -Session_Factory::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Session_Factory::_default_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h index 875535d6b93..336f28af5e2 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h @@ -22,10 +22,10 @@ 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)); - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + PortableServer::POA_ptr _default_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp index 420b6d15b95..053b5a3fb0b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp @@ -40,7 +40,7 @@ public: { } - virtual void run_test (ACE_ENV_SINGLE_ARG_DECL) = 0; + virtual void run_test (void) = 0; virtual int svc (void) { @@ -48,8 +48,7 @@ public: ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->run_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->run_test (); } ACE_CATCHANY { @@ -81,18 +80,16 @@ public: { } - virtual void run_test (ACE_ENV_SINGLE_ARG_DECL) + virtual void run_test (void) { Test::Callback_var cb = - callback->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + callback->_this (); Implicit_Deactivator deactivator (callback); Test::Session_var session = this->session_factory_->create_new_session (cb.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_Utils::Auto_Functor<Test::Session,Shutdown<Test::Session> > auto_shutdown (session.in ()); @@ -112,7 +109,6 @@ public: ACE_hrtime_t start = ACE_OS::gethrtime (); (void) session->sample (start ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { } ACE_ENDTRY; } @@ -146,18 +142,16 @@ public: this->stopped_ = 1; } - virtual void run_test (ACE_ENV_SINGLE_ARG_DECL) + virtual void run_test (void) { Test::Callback_var cb = - callback->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + callback->_this (); Implicit_Deactivator deactivator (callback); Test::Session_var session = this->session_factory_->create_new_session (cb.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_Utils::Auto_Functor<Test::Session,Shutdown<Test::Session> > auto_shutdown (session.in ()); @@ -176,7 +170,6 @@ public: CORBA::ULongLong dummy = 0; (void) session->sample (dummy ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { } ACE_ENDTRY; @@ -202,7 +195,6 @@ int main (int argc, char *argv[]) { ORB_Holder orb (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client_Options options (argc, argv); if (argc != 1) @@ -228,20 +220,16 @@ int main (int argc, char *argv[]) rt_class, options.nthreads ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = RIR_Narrow<PortableServer::POA>::resolve (orb, "RootPOA" 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 (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); PortableServer::POA_var the_poa (rtserver_setup.poa ()); @@ -255,17 +243,14 @@ int main (int argc, char *argv[]) CORBA::Object_var object = orb->string_to_object (options.ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Session_Factory_var session_factory = Test::Session_Factory::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyList_var inconsistent_policies; (void) session_factory->_validate_connection (inconsistent_policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int thread_count = 1 + options.nthreads; ACE_Barrier the_barrier (thread_count); @@ -318,8 +303,7 @@ int main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - all task(s) joined\n")); - session_factory->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + session_factory->shutdown (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - starting cleanup\n")); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp index 59d0eb001d2..c4c38a88f3c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp @@ -70,7 +70,6 @@ int main (int argc, char *argv[]) { ORB_Holder orb (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -80,20 +79,16 @@ int main (int argc, char *argv[]) rt_class, nthreads ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = RIR_Narrow<PortableServer::POA>::resolve (orb, "RootPOA" 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 (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); PortableServer::POA_var the_poa (rtserver_setup.poa ()); @@ -111,12 +106,10 @@ int main (int argc, char *argv[]) ); CORBA::Object_var object = - session_factory->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + session_factory->_this (); CORBA::String_var ior = orb->object_to_string (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the ior to the <ior_output_file> FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); @@ -128,8 +121,7 @@ int main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp index 5e723b3cca5..5a585876a19 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp @@ -39,7 +39,6 @@ int main (int argc, char *argv[]) { ORB_Holder orb (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client_Options options (argc, argv); if (argc != 1) @@ -65,20 +64,16 @@ int main (int argc, char *argv[]) rt_class, 1 // options.nthreads ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = RIR_Narrow<PortableServer::POA>::resolve (orb, "RootPOA" 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 (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); PortableServer::POA_var the_poa (rtserver_setup.poa ()); @@ -95,19 +90,16 @@ int main (int argc, char *argv[]) CORBA::Object_var object = orb->string_to_object (options.ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var ec = RtecEventChannelAdmin::EventChannel::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; EC_Destroyer ec_destroyer (ec.in ()); CORBA::PolicyList_var inconsistent_policies; (void) ec->_validate_connection (inconsistent_policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Found EC, validated connection\n")); @@ -146,7 +138,6 @@ int main (int argc, char *argv[]) { high_priority_group.connect (ec.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; high_priority_disconnect = &high_priority_group; } @@ -176,7 +167,6 @@ int main (int argc, char *argv[]) { high_priority_group.connect (ec.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; high_priority_disconnect = &high_priority_group; } Send_Task high_priority_task; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp index 8c7d83af31a..77e4f6f2d5c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp @@ -74,7 +74,6 @@ int main (int argc, char *argv[]) { ORB_Holder orb (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -84,20 +83,16 @@ int main (int argc, char *argv[]) rt_class, nthreads ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = RIR_Narrow<PortableServer::POA>::resolve (orb, "RootPOA" 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 (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); PortableServer::POA_var ec_poa (rtserver_setup.poa ()); @@ -115,28 +110,22 @@ int main (int argc, char *argv[]) rtserver_setup.rtcorba_setup () ACE_ENV_ARG_PARAMETER) ); - ACE_TRY_CHECK; - ec_impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec_impl->activate (); PortableServer::ObjectId_var ec_id = ec_poa->activate_object (ec_impl.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var ec_object = ec_poa->id_to_reference (ec_id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var ec = RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the ior to the <ior_output_file> FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); @@ -151,7 +140,6 @@ int main (int argc, char *argv[]) do { ACE_Time_Value tv (1, 0); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } while (ec_impl->destroyed () == 0); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl index 3a09d5c68cf..e6da5c6d119 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl @@ -13,8 +13,7 @@ Disconnect<Client>::operator () (Client *client) ACE_DECLARE_NEW_ENV; ACE_TRY { - client->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client->disconnect (); } ACE_CATCHANY { }; ACE_ENDTRY; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp index 7daaf4ae6b4..5e7d3cfa0ac 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp @@ -13,8 +13,8 @@ #include "Client_Group.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - Client_Group, +ACE_RCSID (TAO_PERF_RTEC, + Client_Group, "$Id$") void @@ -61,7 +61,6 @@ Client_Group::connect (RtecEventChannelAdmin::EventChannel_ptr ec Auto_Disconnect<Client_Pair> client_pair_disconnect (&this->client_pair_); this->loopback_pair_.connect (ec ACE_ENV_ARG_PARAMETER); - ACE_CHECK; Auto_Disconnect<Loopback_Pair> loopback_pair_disconnect (&this->loopback_pair_); loopback_pair_disconnect.release (); @@ -69,7 +68,7 @@ Client_Group::connect (RtecEventChannelAdmin::EventChannel_ptr ec } void -Client_Group::disconnect (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Client_Group::disconnect (void) { Auto_Disconnect<Client_Pair> client_pair_disconnect (&this->client_pair_); Auto_Disconnect<Loopback_Pair> loopback_pair_disconnect (&this->loopback_pair_); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h index ef93ba153c1..4b0dbb68bba 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h @@ -75,7 +75,7 @@ public: ACE_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (ACE_ENV_SINGLE_ARG_DECL); + void disconnect (void); //@{ /** @name Accessors diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp index 9f32c911ff2..8b1439975b2 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp @@ -13,8 +13,8 @@ #include "Client_Pair.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - Client_Pair, +ACE_RCSID (TAO_PERF_RTEC, + Client_Pair, "$Id$") void @@ -63,11 +63,9 @@ Client_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec ACE_ENV_ARG_DECL) { this->supplier_->connect (ec ACE_ENV_ARG_PARAMETER); - ACE_CHECK; Auto_Disconnect<Supplier> supplier_disconnect (this->supplier_); this->consumer_->connect (ec ACE_ENV_ARG_PARAMETER); - ACE_CHECK; Auto_Disconnect<Consumer> consumer_disconnect (this->consumer_); consumer_disconnect.release (); @@ -75,7 +73,7 @@ Client_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec } void -Client_Pair::disconnect (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Client_Pair::disconnect (void) { Auto_Disconnect<Supplier> supplier_disconnect (this->supplier_); Auto_Disconnect<Consumer> consumer_disconnect (this->consumer_); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h index 8dc4e8b03b2..e0bc5e5f195 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h @@ -78,7 +78,7 @@ public: ACE_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (ACE_ENV_SINGLE_ARG_DECL); + void disconnect (void); //@{ /** @name Accessors diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp index 5fc7489897e..20c01a4f80b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp @@ -11,8 +11,8 @@ #include "orbsvcs/Event_Service_Constants.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (TAO_PERF_RTEC, - Consumer, +ACE_RCSID (TAO_PERF_RTEC, + Consumer, "$Id$") Consumer::Consumer (CORBA::Long experiment_id, @@ -35,8 +35,7 @@ Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ec->for_consumers (); { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -44,13 +43,11 @@ Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec return; this->proxy_supplier_ = - consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + consumer_admin->obtain_push_supplier (); } RtecEventComm::PushConsumer_var consumer = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); RtecEventChannelAdmin::ConsumerQOS consumer_qos; consumer_qos.is_gateway = 0; @@ -68,11 +65,10 @@ Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec this->proxy_supplier_->connect_push_consumer (consumer.in (), consumer_qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) +Consumer::disconnect (void) { RtecEventChannelAdmin::ProxyPushSupplier_var proxy; { @@ -84,11 +80,9 @@ Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) Implicit_Deactivator deactivator (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_TRY { - proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + proxy->disconnect_push_supplier (); } ACE_CATCHANY { } ACE_ENDTRY; } @@ -125,7 +119,7 @@ Consumer::push (const RtecEventComm::EventSet &events } void -Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Consumer::disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -134,7 +128,7 @@ Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } PortableServer::POA_ptr -Consumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Consumer::_default_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h index f9206fe4ba2..516936d79dc 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h @@ -42,7 +42,7 @@ public: ACE_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (ACE_ENV_SINGLE_ARG_DECL); + void disconnect (void); /// Access the history of samples ACE_Sample_History &sample_history (void); @@ -53,9 +53,9 @@ public: virtual void push (const RtecEventComm::EventSet& events ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual PortableServer::POA_ptr _default_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp index b35d809551c..c52cf21cd5b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp @@ -18,8 +18,8 @@ #include "ace/Basic_Stats.h" #include "ace/Auto_Ptr.h" -ACE_RCSID (TAO_RTEC_Perf, - Control, +ACE_RCSID (TAO_RTEC_Perf, + Control, "$Id$") Control::Control (size_t peers_expected, @@ -86,7 +86,6 @@ Control::join (Federated_Test::Peer_ptr peer { this->peers_[j]->connect (this->peers_[i].in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } } @@ -122,7 +121,6 @@ Control::join (Federated_Test::Peer_ptr peer this->peers_[j]->setup_loopback (experiment_id, base_event_type ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_AUTO_PTR_RESET (disconnects[lcount], new Loopback_Disconnect ( @@ -135,7 +133,6 @@ Control::join (Federated_Test::Peer_ptr peer this->peers_[j]->setup_loopback (experiment_id, base_event_type + 2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_AUTO_PTR_RESET (disconnects[lcount], new Loopback_Disconnect ( @@ -150,7 +147,6 @@ Control::join (Federated_Test::Peer_ptr peer this->peers_[i]->run_experiment (experiment_id, this->iterations_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_Sample_History history (results->length ()); for (CORBA::ULong k = 0; k != results->length (); ++k) @@ -172,7 +168,7 @@ Control::join (Federated_Test::Peer_ptr peer } PortableServer::POA_ptr -Control::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Control::_default_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h index 9b09d063fb0..4b1428e802c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h @@ -42,7 +42,7 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual PortableServer::POA_ptr _default_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp index 220c8c3957c..1142519068c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp @@ -12,8 +12,8 @@ #include "EC_Destroyer.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - EC_Destroyer, +ACE_RCSID (TAO_PERF_RTEC, + EC_Destroyer, "$Id$") EC_Destroyer::EC_Destroyer (RtecEventChannelAdmin::EventChannel_ptr ec) @@ -25,8 +25,7 @@ EC_Destroyer::~EC_Destroyer (void) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->ec_->destroy (); } ACE_CATCH (CORBA::Exception, ex) { // @@ TODO Log this event, check the Servant_var.cpp comments for // details. diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp index ded3aa19ae6..b559160c34a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp @@ -19,12 +19,10 @@ Implicit_Deactivator::Implicit_Deactivator (PortableServer::Servant servant ACE_ENV_ARG_DECL) { this->poa_ = - servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant->_default_POA (); this->id_ = this->poa_->servant_to_id (servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } Implicit_Deactivator::Implicit_Deactivator (Implicit_Deactivator &rhs) @@ -54,7 +52,6 @@ Implicit_Deactivator::~Implicit_Deactivator () ACE_TRY { this->poa_->deactivate_object (this->id_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { // @@ TODO This event should be logged. Cannot throw because that // would make it impossible to use this class effectively. diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp index 41c08b2a882..04c666bc7c5 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp @@ -30,11 +30,10 @@ Loopback::Loopback (CORBA::Long experiment_id, } void -Loopback::disconnect (ACE_ENV_SINGLE_ARG_DECL) +Loopback::disconnect (void) ACE_THROW_SPEC ((CORBA::SystemException)) { Auto_Disconnect<Loopback_Pair> disconnect (&this->loopback_pair_); Implicit_Deactivator deactivator (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h index 384c42cd3cb..05919f2145d 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h @@ -36,7 +36,7 @@ public: //@{ /** @name The Federated_Test::Loopback methods */ - virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL) + virtual void disconnect (void) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp index 2c3d1f8084e..c5ec117f31f 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp @@ -10,8 +10,8 @@ #include "Implicit_Deactivator.h" #include "orbsvcs/Event_Service_Constants.h" -ACE_RCSID (PERF_RTEC, - Loopback_Consumer, +ACE_RCSID (PERF_RTEC, + Loopback_Consumer, "$Id$") Loopback_Consumer:: @@ -31,8 +31,7 @@ Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ec->for_consumers (); { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -40,13 +39,11 @@ Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec return; this->proxy_supplier_ = - consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + consumer_admin->obtain_push_supplier (); } RtecEventComm::PushConsumer_var consumer = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); RtecEventChannelAdmin::ConsumerQOS consumer_qos; consumer_qos.is_gateway = 0; @@ -64,11 +61,10 @@ Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec this->proxy_supplier_->connect_push_consumer (consumer.in (), consumer_qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -Loopback_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) +Loopback_Consumer::disconnect (void) { RtecEventChannelAdmin::ProxyPushSupplier_var proxy; { @@ -80,12 +76,10 @@ Loopback_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) Implicit_Deactivator deactivator (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_TRY { - proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + proxy->disconnect_push_supplier (); } ACE_CATCHANY {} ACE_ENDTRY; } @@ -100,7 +94,7 @@ Loopback_Consumer::push (const RtecEventComm::EventSet &events } void -Loopback_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Loopback_Consumer::disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -109,7 +103,7 @@ Loopback_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } PortableServer::POA_ptr -Loopback_Consumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Loopback_Consumer::_default_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h index 4ff3203146c..d35c8e79453 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h @@ -39,7 +39,7 @@ public: ACE_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (ACE_ENV_SINGLE_ARG_DECL); + void disconnect (void); //@{ /** @name The RtecEventComm::PushConsumer methods @@ -47,9 +47,9 @@ public: virtual void push (const RtecEventComm::EventSet& events ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual PortableServer::POA_ptr _default_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp index 5a0c80aed0c..a68ac6883ce 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp @@ -13,8 +13,8 @@ #include "Loopback_Pair.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - Loopback_Pair, +ACE_RCSID (TAO_PERF_RTEC, + Loopback_Pair, "$Id$") void @@ -37,11 +37,9 @@ Loopback_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec ACE_ENV_ARG_DECL) { this->loopback_supplier_->connect (ec ACE_ENV_ARG_PARAMETER); - ACE_CHECK; Auto_Disconnect<Loopback_Supplier> loopback_supplier_disconnect (this->loopback_supplier_); this->loopback_consumer_->connect (ec ACE_ENV_ARG_PARAMETER); - ACE_CHECK; Auto_Disconnect<Loopback_Consumer> loopback_consumer_disconnect (this->loopback_consumer_); loopback_consumer_disconnect.release (); @@ -49,7 +47,7 @@ Loopback_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec } void -Loopback_Pair::disconnect (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Loopback_Pair::disconnect (void) { Auto_Disconnect<Loopback_Supplier> loopback_supplier_disconnect (this->loopback_supplier_); Auto_Disconnect<Loopback_Consumer> loopback_consumer_disconnect (this->loopback_consumer_); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h index d70b8bfd9a4..ba586aa44c9 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h @@ -57,7 +57,7 @@ public: ACE_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (ACE_ENV_SINGLE_ARG_DECL); + void disconnect (void); //@{ /** @name Accessors diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp index 1e516958c44..b16ae72c2a5 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp @@ -9,8 +9,8 @@ #include "Loopback_Supplier.h" #include "Implicit_Deactivator.h" -ACE_RCSID (TAO_PERF_RTEC, - Loopback_Supplier, +ACE_RCSID (TAO_PERF_RTEC, + Loopback_Supplier, "$Id$") Loopback_Supplier::Loopback_Supplier (CORBA::Long experiment_id, @@ -28,8 +28,7 @@ Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ec->for_suppliers (); { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -37,13 +36,11 @@ Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec return; this->proxy_consumer_ = - supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + supplier_admin->obtain_push_consumer (); } RtecEventComm::PushSupplier_var supplier = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); RtecEventChannelAdmin::SupplierQOS supplier_qos; supplier_qos.is_gateway = 0; @@ -56,11 +53,10 @@ Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec this->proxy_consumer_->connect_push_supplier (supplier.in (), supplier_qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -Loopback_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) +Loopback_Supplier::disconnect (void) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -72,11 +68,9 @@ Loopback_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) Implicit_Deactivator deactivator (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_TRY { - proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + proxy->disconnect_push_consumer (); } ACE_CATCHANY { } ACE_ENDTRY; } @@ -118,7 +112,7 @@ Loopback_Supplier::push (const RtecEventComm::EventSet &source } void -Loopback_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Loopback_Supplier::disconnect_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -127,7 +121,7 @@ Loopback_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } PortableServer::POA_ptr -Loopback_Supplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Loopback_Supplier::_default_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h index 24f2055cf04..3611bf805ba 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h @@ -41,7 +41,7 @@ public: ACE_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (ACE_ENV_SINGLE_ARG_DECL); + void disconnect (void); void push (const RtecEventComm::EventSet &events ACE_ENV_ARG_DECL_NOT_USED) @@ -50,9 +50,9 @@ public: //@{ /** @name The RtecEventComm::PushSupplier methods */ - virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual PortableServer::POA_ptr _default_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp index 36154df9fcd..234764d7780 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp @@ -59,7 +59,6 @@ Low_Priority_Setup (int consumer_count, consumer_poa); this->clients_[i].connect (ec ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Automatically disconnect the group if the connection was // successful this->disconnect_[i] = &this->clients_[i]; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp index a2ee9263b1f..1c546280710 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp @@ -12,8 +12,8 @@ #include "ORB_Holder.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - ORB_Holder, +ACE_RCSID (TAO_PERF_RTEC, + ORB_Holder, "$Id$") ORB_Holder::ORB_Holder (int &argc, char *argv[], @@ -28,8 +28,7 @@ ORB_Holder::~ORB_Holder (void) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->destroy (); } ACE_CATCH (CORBA::Exception, ex) { // @@ TODO Log this event, check the Servant_var.cpp comments for // details. diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl index 13fbb623600..50b1d374110 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl @@ -16,7 +16,6 @@ ORB_Shutdown::operator () (CORBA::ORB_ptr orb) { orb->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { }; ACE_ENDTRY; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp index 369d7f358fa..ce73357a916 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp @@ -27,8 +27,7 @@ ORB_Task::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); } ACE_CATCHANY { diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp index 42bc3fb5676..5eb74cd2775 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp @@ -23,7 +23,6 @@ ORB_Task_Activator::~ORB_Task_Activator (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { (*this->task_)->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { } ACE_ENDTRY; } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp index 2b0a05a1eee..aa7265da3ff 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp @@ -34,24 +34,19 @@ Peer_Base::Peer_Base (CORBA::ORB_ptr orb, rtserver_setup.rtcorba_setup () ACE_ENV_ARG_PARAMETER) ); - ACE_CHECK; - ec_impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ec_impl->activate (); PortableServer::ObjectId_var ec_id = this->poa_->activate_object (ec_impl.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var ec_object = this->poa_->id_to_reference (ec_id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->event_channel_ = RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } Peer_Base::~Peer_Base (void) @@ -59,7 +54,7 @@ Peer_Base::~Peer_Base (void) } void -Peer_Base::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Peer_Base::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { { @@ -72,7 +67,7 @@ Peer_Base::shutdown (ACE_ENV_SINGLE_ARG_DECL) } CORBA::Object_ptr -Peer_Base::channel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Peer_Base::channel (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Object::_duplicate (this->event_channel_.in ()); @@ -85,28 +80,23 @@ Peer_Base::connect (Federated_Test::Peer_ptr remote_peer { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Connecting....\n")); CORBA::Object_var remote_ec_object = - remote_peer->channel (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + remote_peer->channel (); RtecEventChannelAdmin::EventChannel_var remote_ec = RtecEventChannelAdmin::EventChannel::_narrow (remote_ec_object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; Servant_var<TAO_EC_Gateway_IIOP> gateway (new TAO_EC_Gateway_IIOP); gateway->init (remote_ec.in (), this->event_channel_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; RtecEventChannelAdmin::Observer_var observer = - gateway->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + gateway->_this (); RtecEventChannelAdmin::Observer_Handle h = this->event_channel_->append_observer (observer.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; gateway->observer_handle (h); } @@ -124,13 +114,11 @@ Peer_Base::setup_loopback (CORBA::Long experiment_id, this->poa_.in (), this->event_channel_.in () ACE_ENV_ARG_PARAMETER)); - ACE_CHECK_RETURN (Federated_Test::Loopback::_nil ()); Auto_Disconnect<Loopback> disconnect (loopback); Federated_Test::Loopback_var lb = - loopback->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (Federated_Test::Loopback::_nil ()); + loopback->_this (); disconnect.release (); @@ -138,7 +126,7 @@ Peer_Base::setup_loopback (CORBA::Long experiment_id, } PortableServer::POA_ptr -Peer_Base::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Peer_Base::_default_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h index 948ef5b20a1..bc81d6c255a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h @@ -41,11 +41,11 @@ public: //@{ /** @name The Federated_Test::Peer methods */ - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Object_ptr - channel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + channel (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void connect (Federated_Test::Peer_ptr remote_peer @@ -57,7 +57,7 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + PortableServer::POA_ptr _default_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp index bbb980bde7b..196ab2d93ac 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp @@ -14,8 +14,8 @@ #include "PriorityBand_Setup.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - PriorityBand_Setup, +ACE_RCSID (TAO_PERF_RTEC, + PriorityBand_Setup, "$Id$") PriorityBand_Setup::PriorityBand_Setup (CORBA::ORB_ptr orb, @@ -26,13 +26,11 @@ PriorityBand_Setup::PriorityBand_Setup (CORBA::ORB_ptr orb, RIR_Narrow<CORBA::PolicyManager>::resolve (orb, "ORBPolicyManager" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; RTCORBA::RTORB_var rtorb = RIR_Narrow<RTCORBA::RTORB>::resolve (orb, "RTORB" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const RTCORBA::ThreadpoolLanes &lanes = rtcorba_setup.lanes (); @@ -48,14 +46,11 @@ PriorityBand_Setup::PriorityBand_Setup (CORBA::ORB_ptr orb, policy_list[0] = rtorb->create_priority_banded_connection_policy (priority_bands ACE_ENV_ARG_PARAMETER); - ACE_CHECK; policy_manager->set_policy_overrides (policy_list, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policy_list[0]->destroy (); } PriorityBand_Setup::~PriorityBand_Setup (void) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp index ba719129de4..57a0f32e6ff 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp @@ -27,10 +27,8 @@ RIR_Narrow<Interface>::resolve (CORBA::ORB_ptr orb, CORBA::Object_var object = orb->resolve_initial_references (object_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; interface = Interface::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (interface.in ())) { diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp index b5c6d99ae37..4b08ed77d4c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp @@ -16,8 +16,8 @@ #include "RTCORBA_Setup.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - RTCORBA_Setup, +ACE_RCSID (TAO_PERF_RTEC, + RTCORBA_Setup, "$Id$") RTCORBA_Setup::RTCORBA_Setup (CORBA::ORB_ptr orb, @@ -30,7 +30,6 @@ RTCORBA_Setup::RTCORBA_Setup (CORBA::ORB_ptr orb, RIR_Narrow<RTCORBA::PriorityMappingManager>::resolve (orb, "PriorityMappingManager" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->priority_mapping_ = this->priority_mapping_manager_->mapping (); @@ -39,7 +38,6 @@ RTCORBA_Setup::RTCORBA_Setup (CORBA::ORB_ptr orb, RIR_Narrow<RTCORBA::Current>::resolve (orb, "RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; RTCORBA::Priority corba_prc_priority; this->priority_mapping_->to_CORBA (rtclass.priority_process (), @@ -47,22 +45,18 @@ RTCORBA_Setup::RTCORBA_Setup (CORBA::ORB_ptr orb, current->the_priority (corba_prc_priority ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->lanes_.length (3); this->setup_lane (rtclass.priority_high (), this->lanes_[0] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->setup_lane (rtclass.priority_process (), this->lanes_[1] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->setup_lane (rtclass.priority_low (), this->lanes_[2] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->lanes_[2].static_threads = nthreads; this->process_priority_ = this->lanes_[1].lane_priority; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp index 6e3d06125f6..e67964e0482 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp @@ -16,8 +16,8 @@ #include "RTClient_Setup.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - RTClient_Setup, +ACE_RCSID (TAO_PERF_RTEC, + RTClient_Setup, "$Id$") RTClient_Setup::RTClient_Setup (int use_rt_corba, @@ -28,7 +28,6 @@ RTClient_Setup::RTClient_Setup (int use_rt_corba, : use_rt_corba_ (use_rt_corba) , syncscope_setup_ (orb ACE_ENV_ARG_PARAMETER) { - ACE_CHECK; if (use_rt_corba) { @@ -39,7 +38,6 @@ RTClient_Setup::RTClient_Setup (int use_rt_corba, ACE_ENV_ARG_PARAMETER), RTCORBA_Setup ); - ACE_CHECK; #if 0 ACE_AUTO_PTR_RESET (this->priorityband_setup_, @@ -48,8 +46,7 @@ RTClient_Setup::RTClient_Setup (int use_rt_corba, ACE_ENV_ARG_PARAMETER), PriorityBand_Setup ); - ACE_CHECK; - + #endif /* 0 */ } } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp index fdaaee06d30..da8163160b6 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp @@ -17,8 +17,8 @@ #include "RTPOA_Setup.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - RTPOA_Setup, +ACE_RCSID (TAO_PERF_RTEC, + RTPOA_Setup, "$Id$") RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb, @@ -29,13 +29,11 @@ RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb, RIR_Narrow<RTPortableServer::POA>::resolve (orb, "RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; RTCORBA::RTORB_var rtorb = RIR_Narrow<RTCORBA::RTORB>::resolve (orb, "RTORB" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const CORBA::ULong stacksize = 1024 * 1024; // 1 Mb const RTCORBA::ThreadpoolLanes &lanes = rtcorba_setup.lanes (); @@ -52,7 +50,6 @@ RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb, max_buffered_requests, max_request_buffer_size ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // @@ We need an 'auto_ptr for thread pools' here! CORBA::PolicyList policies (4); policies.length (4); @@ -60,17 +57,14 @@ RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb, rtorb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, rtcorba_setup.process_priority () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; policies[1] = root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID ACE_ENV_ARG_PARAMETER); - ACE_CHECK; policies[2] = root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); - ACE_CHECK; #if 0 policies.length (3); @@ -78,23 +72,19 @@ RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb, policies[3] = rtorb->create_threadpool_policy (pool_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; #endif /* 0 */ PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + root_poa->the_POAManager (); this->poa_ = root_poa->create_POA ("RTEC_Perf", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; for (CORBA::ULong i = 0; i != policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policies[i]->destroy (); } } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp index 609f8f7b314..0bd232c2feb 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp @@ -16,8 +16,8 @@ #include "RTServer_Setup.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (TAO_PERF_RTEC, - RTServer_Setup, +ACE_RCSID (TAO_PERF_RTEC, + RTServer_Setup, "$Id$") RTServer_Setup::RTServer_Setup (int use_rt_corba, @@ -31,7 +31,6 @@ RTServer_Setup::RTServer_Setup (int use_rt_corba, nthreads ACE_ENV_ARG_PARAMETER) { - ACE_CHECK; if (use_rt_corba) { @@ -41,7 +40,6 @@ RTServer_Setup::RTServer_Setup (int use_rt_corba, ACE_ENV_ARG_PARAMETER), RTPOA_Setup ); - ACE_CHECK; this->poa_ = this->rtpoa_setup_->poa (); @@ -52,6 +50,5 @@ RTServer_Setup::RTServer_Setup (int use_rt_corba, RIR_Narrow<RTPortableServer::POA>::resolve (orb, "RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp index 125e75c85e7..5c294a3bdb7 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp @@ -115,7 +115,6 @@ Send_Task::svc (void) { // push one event... this->supplier_->push (event ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.cpp index 7e154ad088b..0f5f58f6cd6 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.cpp @@ -24,8 +24,7 @@ Servant_var<SERVANT>::~Servant_var () ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->ptr_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->ptr_->_remove_ref (); } ACE_CATCHANY { // @@ TODO This event should be logged. Cannot throw because that // would make it impossible to use this class effectively. diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl index aa5af0895cb..45b3b310c67 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl @@ -12,8 +12,7 @@ Shutdown<Client>::operator () (Client *client) ACE_DECLARE_NEW_ENV; ACE_TRY { - client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client->shutdown (); } ACE_CATCHANY { }; ACE_ENDTRY; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp index 11c14e80232..1964145efac 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp @@ -9,8 +9,8 @@ #include "Supplier.h" #include "Implicit_Deactivator.h" -ACE_RCSID (TAO_PERF_RTEC, - Supplier, +ACE_RCSID (TAO_PERF_RTEC, + Supplier, "$Id$") Supplier::Supplier (CORBA::Long experiment_id, @@ -29,8 +29,7 @@ Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ec->for_suppliers (); { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -38,13 +37,11 @@ Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec return; this->proxy_consumer_ = - supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + supplier_admin->obtain_push_consumer (); } RtecEventComm::PushSupplier_var supplier = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); RtecEventChannelAdmin::SupplierQOS supplier_qos; supplier_qos.is_gateway = 0; @@ -60,11 +57,10 @@ Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec this->proxy_consumer_->connect_push_supplier (supplier.in (), supplier_qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) +Supplier::disconnect (void) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -76,12 +72,10 @@ Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) Implicit_Deactivator deactivator (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_TRY { - proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + proxy->disconnect_push_consumer (); } ACE_CATCHANY {} ACE_ENDTRY; } @@ -105,7 +99,7 @@ Supplier::push (const RtecEventComm::EventSet &events } void -Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Supplier::disconnect_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -114,7 +108,7 @@ Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } PortableServer::POA_ptr -Supplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Supplier::_default_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h index 4ae8d76a414..3dc90af4fc0 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h @@ -42,7 +42,7 @@ public: ACE_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (ACE_ENV_SINGLE_ARG_DECL); + void disconnect (void); void push (const RtecEventComm::EventSet &events ACE_ENV_ARG_DECL_NOT_USED) @@ -51,9 +51,9 @@ public: //@{ /** @name The RtecEventComm::PushSupplier methods */ - virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual PortableServer::POA_ptr _default_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp index b0f66d12d9e..ef94e88f1b4 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp @@ -42,7 +42,6 @@ SyncScope_Setup::init (CORBA::ORB_ptr orb, RIR_Narrow<CORBA::PolicyManager>::resolve (orb, "ORBPolicyManager" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::PolicyList policy_list (1); policy_list.length (1); @@ -56,14 +55,11 @@ SyncScope_Setup::init (CORBA::ORB_ptr orb, orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, sync_scope ACE_ENV_ARG_PARAMETER); - ACE_CHECK; policy_manager->set_policy_overrides (policy_list, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policy_list[0]->destroy (); } SyncScope_Setup::~SyncScope_Setup (void) |