summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2005-09-22 08:42:16 +0000
committerBenoit Foucher <benoit@zeroc.com>2005-09-22 08:42:16 +0000
commit86b4c4ef54800261ef99c8f8a546b166ae82534a (patch)
tree841eefa92b980fd9507dafca68a834ff82375964
parentFix (diff)
downloadice-86b4c4ef54800261ef99c8f8a546b166ae82534a.tar.bz2
ice-86b4c4ef54800261ef99c8f8a546b166ae82534a.tar.xz
ice-86b4c4ef54800261ef99c8f8a546b166ae82534a.zip
Fix
-rw-r--r--cpp/src/IceGrid/NodeI.cpp2
-rw-r--r--cpp/src/IceGrid/NodeI.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp
index cdd8cc30999..3c4f7f9304f 100644
--- a/cpp/src/IceGrid/NodeI.cpp
+++ b/cpp/src/IceGrid/NodeI.cpp
@@ -645,7 +645,7 @@ NodeI::keepAlive()
nl.n_value = 0;
if(knlist(&nl, 1, sizeof(nl)) != 0)
{
- if(pread(kmem, avenrun, sizeof(avenrun), nl.n_value) >= sizeof(avenrun))
+ if(pread(_kmem, avenrun, sizeof(avenrun), nl.n_value) >= sizeof(avenrun))
{
info.load1 = avenrun[0] / 65535.0f;
info.load5 = avenrun[1] / 65535.0f;
diff --git a/cpp/src/IceGrid/NodeI.h b/cpp/src/IceGrid/NodeI.h
index 43484f2aff4..0af035bb23f 100644
--- a/cpp/src/IceGrid/NodeI.h
+++ b/cpp/src/IceGrid/NodeI.h
@@ -90,6 +90,9 @@ private:
int _last15Total;
#else
int _nproc;
+#ifdef _AIX
+ int _kmem;
+#endif
#endif
struct PatchDirectory