diff options
Diffstat (limited to 'TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp')
| -rw-r--r-- | TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp | 107 |
1 files changed, 33 insertions, 74 deletions
diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp index b0bb0a36701..d2f4003bb36 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp @@ -48,8 +48,7 @@ usage (const ACE_TCHAR * cmd) void parse_args (int argc, - ACE_TCHAR *argv[] - ACE_ENV_ARG_DECL) + ACE_TCHAR *argv[]) { ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("l:k:t:s:i:m:h")); @@ -89,7 +88,7 @@ parse_args (int argc, ACE_TEXT ("ERROR: Invalid push interval: %s\n"), s)); - ACE_THROW (CORBA::BAD_PARAM ()); + throw CORBA::BAD_PARAM (); } break; @@ -100,7 +99,7 @@ parse_args (int argc, default: ::usage (argv[0]); - ACE_THROW (CORBA::BAD_PARAM ()); + throw CORBA::BAD_PARAM (); } } } @@ -120,21 +119,16 @@ TAO_LB_run_load_monitor (void * orb_arg) // delivered to this thread on Linux. ACE_Sig_Guard signal_guard; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "TAO Load Monitor"); + ex._tao_print_exception ("TAO Load Monitor"); return reinterpret_cast<void *> (-1); } - ACE_ENDTRY; - ACE_CHECK_RETURN (reinterpret_cast<void *> (-1)); return 0; } @@ -143,29 +137,23 @@ TAO_LB_run_load_monitor (void * orb_arg) CosLoadBalancing::LoadMonitor_ptr get_load_monitor (CORBA::ORB_ptr orb, - PortableServer::POA_ptr root_poa - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr root_poa) { if (::custom_monitor_ior != 0) { CORBA::Object_var obj = - orb->string_to_object (::custom_monitor_ior - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CosLoadBalancing::LoadMonitor::_nil ()); + orb->string_to_object (::custom_monitor_ior); - return CosLoadBalancing::LoadMonitor::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + return CosLoadBalancing::LoadMonitor::_narrow (obj.in ()); } else { // The POA is only needed for the built-in load monitors since // they must be activated. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CosLoadBalancing::LoadMonitor::_nil ()); + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CosLoadBalancing::LoadMonitor::_nil ()); + poa_manager->activate (); if (ACE_OS::strcasecmp (::mtype, "CPU") == 0) { @@ -174,12 +162,11 @@ get_load_monitor (CORBA::ORB_ptr orb, TAO_LB_CPU_Load_Average_Monitor (::location_id, ::location_kind), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CosLoadBalancing::LoadMonitor::_nil ()); // Transfer ownership to the POA. PortableServer::ServantBase_var s = monitor; - return monitor->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + return monitor->_this (); } else if (ACE_OS::strcasecmp (::mtype, "Disk") == 0 || ACE_OS::strcasecmp (::mtype, "Memory") == 0 @@ -211,19 +198,15 @@ register_load_monitor (CosLoadBalancing::LoadManager_ptr manager, CosLoadBalancing::LoadMonitor_ptr monitor, TAO_LB_Push_Handler * handler, ACE_Reactor * reactor, - long & timer_id - ACE_ENV_ARG_DECL) + long & timer_id) { if (ACE_OS::strcasecmp (::mstyle, "PULL") == 0) { PortableGroup::Location_var location = - monitor->the_location (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + monitor->the_location (); manager->register_load_monitor (location.in (), - monitor - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + monitor); } else if (ACE_OS::strcasecmp (::mstyle, "PUSH") == 0) { @@ -240,7 +223,7 @@ register_load_monitor (CosLoadBalancing::LoadManager_ptr manager, ACE_TEXT ("ERROR: Unable to schedule timer for ") ACE_TEXT ("\"PUSH\" style load monitoring.\n"))); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } else @@ -250,60 +233,44 @@ register_load_monitor (CosLoadBalancing::LoadManager_ptr manager, ACE_TEXT ("style: <%s>.\n"), ::mstyle)); - ACE_THROW (CORBA::BAD_PARAM ()); + throw CORBA::BAD_PARAM (); } } int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // The usual server side boilerplate code. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ""); // Check the non-ORB arguments. ::parse_args (argc, - argv - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + argv); CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + PortableServer::POA::_narrow (obj.in ()); CosLoadBalancing::LoadMonitor_var load_monitor = ::get_load_monitor (orb.in (), - root_poa.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa.in ()); PortableGroup::Location_var location = - load_monitor->the_location (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + load_monitor->the_location (); // The "LoadManager" reference should have already been // registered with the ORB by its ORBInitializer. - obj = orb->resolve_initial_references ("LoadManager" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + obj = orb->resolve_initial_references ("LoadManager"); CosLoadBalancing::LoadManager_var load_manager = - CosLoadBalancing::LoadManager::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + CosLoadBalancing::LoadManager::_narrow (obj.in ()); // This "push" handler will only be used if the load monitor // style is "PUSH". @@ -319,9 +286,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) load_monitor.in (), &push_handler, reactor, - timer_id - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + timer_id); CosLoadBalancing::LoadManager_ptr tmp;; @@ -362,9 +327,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // load monitoring case. if (timer_id == -1) { - load_manager->remove_load_monitor (location.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + load_manager->remove_load_monitor (location.in ()); } #else // Activate/register the signal handler that (attempts) to @@ -384,8 +347,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // handler thread shuts down the ORB before it is run, the // below call to ORB::run() will throw a CORBA::BAD_INV_ORDER // exception. - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); // Wait for the signal handler thread to finish // before the process exits. @@ -401,17 +363,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Just keep going. We're shutting down anyway. } - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "TAO Load Monitor"); + ex._tao_print_exception ("TAO Load Monitor"); return -1; } - ACE_ENDTRY; return 0; } |