Changeset 46320 in vbox

Timestamp:

May 30, 2013 9:26:26 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

86089

Message:

Main/PerformanceSolaris: switch to the runtime function for determining total/free RAM

File:

• trunk/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp

@@ -36 +36 @@
 #include <iprt/param.h>
 #include <iprt/path.h>
+#include <iprt/system.h>
+
 #include "Logging.h"
 #include "Performance.h"
@@ -85 +87 @@
     uint64_t wrapDetection(uint64_t cur, uint64_t prev, const char *name);
 
-    kstat_ctl_t *mKC;
-    kstat_t     *mSysPages;
-    kstat_t     *mZFSCache;
+    kstat_ctl_t      *mKC;
+    kstat_t          *mSysPages;
+    kstat_t          *mZFSCache;
 
     void             *mZfsSo;
@@ -103 +105 @@
     FsMap             mFsMap;
     uint32_t          mCpus;
+
+    ULONG             totalRAM;
 };
 
@@ -151 +155 @@
         mZpoolVdevName  =  (PFNZPOOLVDEVNAME)dlsym(mZfsSo, "zpool_vdev_name");
 
-        if (mZfsInit && mZfsOpen && mZfsClose && mZfsPropGetInt
-            && mZpoolOpen && mZpoolClose && mZpoolGetConfig && mZpoolVdevName)
+        if (   mZfsInit
+            && mZfsOpen
+            && mZfsClose
+            && mZfsPropGetInt
+            && mZpoolOpen
+            && mZpoolClose
+            && mZpoolGetConfig
+            && mZpoolVdevName)
             mZfsLib = mZfsInit();
         else
@@ -161 +171 @@
     updateFilesystemMap();
     /* Notice that mCpus member will be initialized by HostCpuLoadRaw::init() */
+
+    uint64_t cb;
+    int rc = RTSystemQueryTotalRam(&cb);
+    if (RT_FAILURE(rc))
+        totalRAM = 0;
+    else
+        totalRAM = (ULONG)(cb / 1024);
 }
 
@@ -265 +282 @@
 int CollectorSolaris::getHostMemoryUsage(ULONG *total, ULONG *used, ULONG *available)
 {
-    int rc = VINF_SUCCESS;
-
-    kstat_named_t *kn;
-
-    if (mKC == 0 || mSysPages == 0)
-        return VERR_INTERNAL_ERROR;
-
-    if (kstat_read(mKC, mSysPages, 0) == -1)
-    {
-        Log(("kstat_read(sys_pages) -> %d\n", errno));
-        return VERR_INTERNAL_ERROR;
-    }
-    if ((kn = (kstat_named_t *)kstat_data_lookup(mSysPages, (char *)"freemem")) == 0)
-    {
-        Log(("kstat_data_lookup(freemem) -> %d\n", errno));
-        return VERR_INTERNAL_ERROR;
-    }
-    *available = kn->value.ul * (PAGE_SIZE/1024);
-
-    if (kstat_read(mKC, mZFSCache, 0) != -1)
-    {
-        if (mZFSCache)
-        {
-            if ((kn = (kstat_named_t *)kstat_data_lookup(mZFSCache, (char *)"size")))
-            {
-                ulong_t ulSize = kn->value.ul;
-
-                if ((kn = (kstat_named_t *)kstat_data_lookup(mZFSCache, (char *)"c_min")))
-                {
-                    /*
-                     * Account for ZFS minimum arc cache size limit.
-                     * "c_min" is the target minimum size of the ZFS cache, and not the hard limit. It's possible
-                     * for "size" to shrink below "c_min" (e.g: during boot & high memory consumption).
-                     */
-                    ulong_t ulMin = kn->value.ul;
-                    *available += ulSize > ulMin ? (ulSize - ulMin) / 1024 : 0;
-                }
-                else
-                    Log(("kstat_data_lookup(c_min) ->%d\n", errno));
-            }
-            else
-                Log(("kstat_data_lookup(size) -> %d\n", errno));
-        }
-        else
-            Log(("mZFSCache missing.\n"));
-    }
-
-    if ((kn = (kstat_named_t *)kstat_data_lookup(mSysPages, (char *)"physmem")) == 0)
-    {
-        Log(("kstat_data_lookup(physmem) -> %d\n", errno));
-        return VERR_INTERNAL_ERROR;
-    }
-    *total = kn->value.ul * (PAGE_SIZE/1024);
-    *used = *total - *available;
-
-    return rc;
+        uint64_t cb;
+        int rc = RTSystemQueryAvailableRam(&cb);
+        if (RT_SUCCESS(rc))
+        {
+            *total = totalRAM;
+            *available = cb / 1024;
+            *used = *total - *available;
+        }
+        return rc;
 }