Changeset 12133 in vbox for trunk/src/VBox

Timestamp:

Sep 5, 2008 2:13:33 PM (16 years ago)

Author:

vboxsync

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

36087

Message:

PerfAPI: Improved performance of getHostMemoryUsage() on Darwin

Location:

trunk/src/VBox/Main

Files:

• darwin/PerformanceDarwin.cpp (modified) (3 diffs)
• testcase/tstCollector.cpp (modified) (1 diff)

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

@@ -65 +65 @@
 {
 public:
+    CollectorDarwin();
     virtual int getRawHostCpuLoad(uint64_t *user, uint64_t *kernel, uint64_t *idle);
     virtual int getHostMemoryUsage(ULONG *total, ULONG *used, ULONG *available);
     virtual int getRawProcessCpuLoad(RTPROCESS process, uint64_t *user, uint64_t *kernel, uint64_t *total);
     virtual int getProcessMemoryUsage(RTPROCESS process, ULONG *used);
+private:
+    ULONG totalRAM;
 };
 
@@ -75 +78 @@
     mHAL = new CollectorDarwin();
     Assert(mHAL);
+}
+
+CollectorDarwin::CollectorDarwin()
+{
+    uint64_t hostMemory;
+    int mib[2];
+    size_t size;
+
+    mib[0] = CTL_HW;
+    mib[1] = HW_MEMSIZE;
+
+    size = sizeof(hostMemory);
+    if (sysctl(mib, 2, &hostMemory, &size, NULL, 0) == -1) {
+        Log(("sysctl() -> %s", strerror(errno)));
+        hostMemory = 0;
+    }
+    totalRAM = (ULONG)(hostMemory / 1024);
 }
 
@@ -114 +134 @@
     }
 
-    uint64_t hostMemory;
-    int mib[2];
-    size_t size;
-
-    mib[0] = CTL_HW;
-    mib[1] = HW_MEMSIZE;
-
-    size = sizeof(hostMemory);
-    if (sysctl(mib, 2, &hostMemory, &size, NULL, 0) == -1) {
-        int error = errno;
-        Log(("sysctl() -> %s", strerror(error)));
-        return RTErrConvertFromErrno(error);
-    }
-    *total = (ULONG)(hostMemory / 1024);
+    *total = totalRAM;
     *available = info.free_count * (PAGE_SIZE / 1024);
     *used = *total - *available;

trunk/src/VBox/Main/testcase/tstCollector.cpp

@@ -76 +76 @@
     { \
         RTPrintf("tstCollector: "#fn" -> %Vrc\n", rc); \
-        return 1; \
     } \
-    RTPrintf("%50s -- %u calls per second\n", #fn, nCalls)
+    else \
+        RTPrintf("%50s -- %u calls per second\n", #fn, nCalls)
 
 int main(int argc, char *argv[])