diff options
| author | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-04-21 16:10:21 +0000 |
|---|---|---|
| committer | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-04-21 16:10:21 +0000 |
| commit | cc0ec985c955a6aaf75f5da1d292df57e1d32970 (patch) | |
| tree | 92dc26aa896a8dcdf45c7019fe917336555a036f /TAO/orbsvcs/LoadBalancer | |
| parent | d5b244bfc20d61cb29e9bc0ef3db3f437e4fc2f9 (diff) | |
| download | ATCD-cc0ec985c955a6aaf75f5da1d292df57e1d32970.tar.gz | |
Wed Apr 21 11:08:22 2004 Jaiganesh B <jai@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/orbsvcs/LoadBalancer')
| -rw-r--r-- | TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp index 7fc036732ac..aaadc7a2e05 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp @@ -1,7 +1,7 @@ #include "Push_Handler.h" #include "Monitor_Signal_Handler.h" -#include "orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.h" +#include "orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h" #include "orbsvcs/orbsvcs/LoadBalancing/LB_conf.h" #include "tao/ORB_Core.h" @@ -168,9 +168,9 @@ get_load_monitor (CORBA::ORB_ptr orb, if (ACE_OS::strcasecmp (::mtype, "CPU") == 0) { - TAO_LB_CPU_Monitor * monitor = 0; + TAO_LB_CPU_Load_Average_Monitor * monitor = 0; ACE_NEW_THROW_EX (monitor, - TAO_LB_CPU_Monitor (::location_id, + TAO_LB_CPU_Load_Average_Monitor (::location_id, ::location_kind), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosLoadBalancing::LoadMonitor::_nil ()); diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor b/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor index 581f9e06018..940cb2d80a4 100644 --- a/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor +++ b/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor @@ -343,7 +343,7 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(ACE_ROOT)/ace/Signal.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ @@ -1463,7 +1463,7 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(ACE_ROOT)/ace/Signal.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ |