diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp index cae9a5df6bf..a0cebd7da5a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp @@ -51,12 +51,12 @@ TAO_LB_CPU_Load_Average_Monitor::TAO_LB_CPU_Load_Average_Monitor ( } } -TAO_LB_CPU_Load_Average_Monitor::~TAO_LB_CPU_Load_Average_Monitor (void) +TAO_LB_CPU_Load_Average_Monitor::~TAO_LB_CPU_Load_Average_Monitor () { } CosLoadBalancing::Location * -TAO_LB_CPU_Load_Average_Monitor::the_location (void) +TAO_LB_CPU_Load_Average_Monitor::the_location () { CosLoadBalancing::Location * location; ACE_NEW_THROW_EX (location, @@ -71,7 +71,7 @@ TAO_LB_CPU_Load_Average_Monitor::the_location (void) } CosLoadBalancing::LoadList * -TAO_LB_CPU_Load_Average_Monitor::loads (void) +TAO_LB_CPU_Load_Average_Monitor::loads () { CORBA::Float load = 0; @@ -107,7 +107,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads (void) load = ((system_ll - idle_ll) * 100 / system_ll) / sys_info.dwNumberOfProcessors; } -#elif defined (linux) || defined (sun) +#elif defined (ACE_LINUX) || defined (sun) // Only bother getting the load average over the last minute. // @@ -115,7 +115,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads (void) // last 5 and 15 minutes can be used instead. double loadavg[1]; -# if defined (linux) \ +# if defined (ACE_LINUX) \ && ((defined (__GLIBC__) && defined (__GLIBC_MINOR__) \ && __GLIBC__ == 2 && __GLIBC_MINOR__ < 2) \ || (!defined (_BSD_SOURCE) && !defined (_GNU_SOURCE))) @@ -217,8 +217,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads (void) #endif -#if defined (linux) || defined (sun) || defined (__hpux) || defined(__NetBSD__) || defined (__APPLE__) - +#if defined (ACE_LINUX) || defined (sun) || defined (__hpux) || defined(__NetBSD__) || defined (__APPLE__) CosLoadBalancing::LoadList * tmp = 0; ACE_NEW_THROW_EX (tmp, CosLoadBalancing::LoadList (1), |