diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-09-20 14:28:01 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-09-20 14:28:01 +0000 |
| commit | 1a116ec2dff5ecb99b8ff661829a2e215c2da9f1 (patch) | |
| tree | 8e2cf5558e809cc90dff93b3452f0d9c15896bc6 /cpp/src | |
| parent | VC71 fixes. (diff) | |
| download | ice-1a116ec2dff5ecb99b8ff661829a2e215c2da9f1.tar.bz2 ice-1a116ec2dff5ecb99b8ff661829a2e215c2da9f1.tar.xz ice-1a116ec2dff5ecb99b8ff661829a2e215c2da9f1.zip | |
Fix
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/NodeI.cpp | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp index 539f0e6908d..aa1943e0ad6 100644 --- a/cpp/src/IceGrid/NodeI.cpp +++ b/cpp/src/IceGrid/NodeI.cpp @@ -19,12 +19,12 @@ #include <IceGrid/WaitQueue.h> #include <IceGrid/TraceLevels.h> -#ifdef _WIN32 +#if defined(_WIN32) # include <direct.h> // For _getcwd -#endif - -#ifdef __APPLE__ +#elif defined(__APPLE__) # include <sys/sysctl.h> +#elif defined(__hpux) +# include <sys/pstat.h> #endif using namespace std; @@ -559,6 +559,10 @@ NodeI::keepAlive() try { LoadInfo info; + info.load1 = 1.0f; + info.load5 = 1.0f; + info.load15 = 1.0f; + info.nProcessors = 1; #if defined(_WIN32) // @@ -595,18 +599,23 @@ NodeI::keepAlive() // not. The result is capped at 1.0f. // double loadAvg[3]; - getloadavg(loadAvg, 3); - info.load1 = static_cast<float>(loadAvg[0]); - info.load5 = static_cast<float>(loadAvg[1]); - info.load15 = static_cast<float>(loadAvg[2]); + if(getloadavg(loadAvg, 3) != -1) + { + info.load1 = static_cast<float>(loadAvg[0]); + info.load5 = static_cast<float>(loadAvg[1]); + info.load15 = static_cast<float>(loadAvg[2]); + } info.nProcessors = _nproc; -#else - info.load1 = 1.0f; - info.load5 = 1.0f; - info.load15 = 1.0f; - info.nProcessors = 1; +#elif defined(__hpux) + struct pst_dynamic dynInfo; + if(pstat_getdynamic(&dynInfo, sizeof(dynInfo), 0, 0) >= 0) + { + info.load1 = dynInfo.psd_avg_1_min; + info.load5 = dynInfo.psd_avg_5_min; + info.load15 = dynInfo.psd_avg_15_min; + } + info.nProcessors = 1; // TODO #endif - session->keepAlive(info); } catch(const Ice::LocalException&) |