diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-30 18:39:37 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-30 18:39:37 +0100 |
| commit | b2a6ad2ea01ad9ed8e654d158b6486fefdb6936a (patch) | |
| tree | 0685635093f03673d7faef4f2794334802e27317 /TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp | |
| parent | a46852de783998ac9c3384fdb55277ef3906cf15 (diff) | |
| download | ATCD-b2a6ad2ea01ad9ed8e654d158b6486fefdb6936a.tar.gz | |
Instead of checking for the linux define use ACE_LINUX, the first doesn't seem to be set on RHEL75
* TAO/DevGuideExamples/RTCORBA/README:
* TAO/DevGuideExamples/RTCORBA/common.cpp:
* TAO/orbsvcs/LoadBalancer/LoadManager.cpp:
* TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp:
* TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp:
* TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp:
* TAO/tests/Time_Policy/main.cpp:
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 | 7 |
1 files changed, 3 insertions, 4 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 184f5c13129..a0cebd7da5a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp @@ -107,7 +107,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads () 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 () // 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 () #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), |