Changeset 46328 in vbox for trunk/src/VBox/Main

Timestamp:

May 30, 2013 12:37:09 PM (12 years ago)

Author:

vboxsync

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

86099

Message:

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

Location:

trunk/src/VBox/Main/src-server

Files:

• darwin/PerformanceDarwin.cpp (modified) (2 diffs)
• linux/PerformanceLinux.cpp (modified) (4 diffs)
• solaris/PerformanceSolaris.cpp (modified) (2 diffs)
• win/PerformanceWin.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/darwin/PerformanceDarwin.cpp

@@ -66 +66 @@
     virtual int getProcessMemoryUsage(RTPROCESS process, ULONG *used);
 private:
-    ULONG totalRAM;
+    ULONG    totalRAM;
     uint32_t nCpus;
 };
@@ -116 +116 @@
 int CollectorDarwin::getHostMemoryUsage(ULONG *total, ULONG *used, ULONG *available)
 {
+    AssertReturn(totalRAM, VERR_INTERNAL_ERROR);
     uint64_t cb;
     int rc = RTSystemQueryAvailableRam(&cb);

trunk/src/VBox/Main/src-server/linux/PerformanceLinux.cpp

@@ -30 +30 @@
 #include <iprt/path.h>
 #include <iprt/string.h>
+#include <iprt/system.h>
 #include <iprt/mp.h>
 
@@ -80 +81 @@
     uint64_t     mSingleUser, mSingleKernel, mSingleIdle;
     uint32_t     mHZ;
+    ULONG        totalRAM;
 };
 
@@ -100 +102 @@
         mHZ = hz;
     LogFlowThisFunc(("mHZ=%u\n", mHZ));
+
+    uint64_t cb;
+    int rc = RTSystemQueryTotalRam(&cb);
+    if (RT_FAILURE(rc))
+        totalRAM = 0;
+    else
+        totalRAM = (ULONG)(cb / 1024);
 }
 
@@ -202 +211 @@
 int CollectorLinux::getHostMemoryUsage(ULONG *total, ULONG *used, ULONG *available)
 {
-    int rc = VINF_SUCCESS;
-    ULONG buffers, cached;
-    FILE *f = fopen("/proc/meminfo", "r");
-
-    if (f)
-    {
-        int processed = fscanf(f, "MemTotal: %u kB\n", total);
-        processed    += fscanf(f, "MemFree: %u kB\n", available);
-        processed    += fscanf(f, "Buffers: %u kB\n", &buffers);
-        processed    += fscanf(f, "Cached: %u kB\n", &cached);
-        if (processed == 4)
-        {
-            *available += buffers + cached;
-            *used       = *total - *available;
-        }
-        else
-            rc = VERR_FILE_IO_ERROR;
-        fclose(f);
-    }
-    else
-        rc = VERR_ACCESS_DENIED;
-
+    AssertReturn(totalRAM, VERR_INTERNAL_ERROR);
+    uint64_t cb;
+    int rc = RTSystemQueryAvailableRam(&cb);
+    if (RT_SUCCESS(rc))
+    {
+        *total = totalRAM;
+        *available = cb / 1024;
+        *used = *total - *available;
+    }
     return rc;
 }

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

@@ -105 +105 @@
     FsMap             mFsMap;
     uint32_t          mCpus;
-
     ULONG             totalRAM;
 };
@@ -282 +281 @@
 int CollectorSolaris::getHostMemoryUsage(ULONG *total, ULONG *used, ULONG *available)
 {
-        uint64_t cb;
-        int rc = RTSystemQueryAvailableRam(&cb);
-        if (RT_SUCCESS(rc))
-        {
-            *total = totalRAM;
-            *available = cb / 1024;
-            *used = *total - *available;
-        }
-        return rc;
+    AssertReturn(totalRAM, VERR_INTERNAL_ERROR);
+    uint64_t cb;
+    int rc = RTSystemQueryAvailableRam(&cb);
+    if (RT_SUCCESS(rc))
+    {
+        *total = totalRAM;
+        *available = cb / 1024;
+        *used = *total - *available;
+    }
+    return rc;
 }
 

trunk/src/VBox/Main/src-server/win/PerformanceWin.cpp

@@ -90 +90 @@
     HMODULE mhNtDll;
 
-    ULONG totalRAM;
+    ULONG   totalRAM;
 };
 
@@ -311 +311 @@
 int CollectorWin::getHostMemoryUsage(ULONG *total, ULONG *used, ULONG *available)
 {
+    AssertReturn(totalRAM, VERR_INTERNAL_ERROR);
     uint64_t cb;
     int rc = RTSystemQueryAvailableRam(&cb);