diff options
Diffstat (limited to 'orbsvcs/LoadBalancer/LoadMonitor.cpp')
| -rw-r--r-- | orbsvcs/LoadBalancer/LoadMonitor.cpp | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/orbsvcs/LoadBalancer/LoadMonitor.cpp b/orbsvcs/LoadBalancer/LoadMonitor.cpp index 838c077e17e..7f6e6b8f473 100644 --- a/orbsvcs/LoadBalancer/LoadMonitor.cpp +++ b/orbsvcs/LoadBalancer/LoadMonitor.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "Push_Handler.h" #include "Monitor_Signal_Handler.h" @@ -11,12 +13,6 @@ #include "ace/OS_main.h" #include "ace/OS_NS_strings.h" - -ACE_RCSID (LoadBalancer, - LoadMonitor, - "$Id$") - - static const ACE_TCHAR * location_id = 0; static const ACE_TCHAR * location_kind = 0; static const ACE_TCHAR * mtype = ACE_TEXT("CPU"); @@ -283,14 +279,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) reactor, timer_id); - CosLoadBalancing::LoadManager_ptr tmp;; - - if (timer_id == -1) - tmp = load_manager.in (); // PULL monitoring - else - tmp = CosLoadBalancing::LoadManager::_nil (); // PUSH - // monitoring - #if defined (linux) && defined (ACE_HAS_THREADS) if (ACE_Thread_Manager::instance ()->spawn (::TAO_LB_run_load_monitor, orb.in ()) == -1) @@ -329,6 +317,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // ensure graceful shutdown of the LoadMonitor so that // LoadMonitors registered with the LoadManager can be // deregistered. + CosLoadBalancing::LoadManager_ptr tmp; + + if (timer_id == -1) + tmp = load_manager.in (); // PULL monitoring + else + tmp = CosLoadBalancing::LoadManager::_nil (); // PUSH + // monitoring TAO_LB_Monitor_Signal_Handler signal_handler ( orb.in (), root_poa.in (), |