diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.cpp index 6e373d47fa4..32e3cbf1e52 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.cpp @@ -42,9 +42,10 @@ TAO_LB_CPU_Monitor::TAO_LB_CPU_Monitor (const char * location_id, else { this->location_[0].id = CORBA::string_dup (location_id); - - if (location_kind != 0) - this->location_[0].kind = CORBA::string_dup (location_kind); + this->location_[0].kind = + (location_kind == 0 + ? CORBA::string_dup ("User Specified") + : CORBA::string_dup (location_kind)); } } @@ -129,7 +130,11 @@ TAO_LB_CPU_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL) # else +# if defined (ACE_HAS_SYS_LOADAVG_H) const int samples = ::getloadavg (loadavg, 1); +# else + const int samples = 0; +# endif /* ACE_HAS_SYS_LOADAVG_H */ # endif /* linux && ((__GLIBC__ == 2 && __GLIBC_MINOR__ < 2) |