Changeset 44475 in vbox for trunk/src/VBox/Main/src-server/darwin/PerformanceDarwin.cpp

Timestamp:

Jan 30, 2013 6:59:04 PM (12 years ago)

Author:

vboxsync

Message:

Main/Metrics: Per-VM CPU load fix for Darwin (#6345)

File:

• trunk/src/VBox/Main/src-server/darwin/PerformanceDarwin.cpp (modified) (4 diffs)

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

@@ -25 +25 @@
 #include <iprt/err.h>
 #include <iprt/log.h>
+#include <iprt/mp.h>
 #include <iprt/param.h>
 #include <iprt/system.h>
@@ -66 +67 @@
 private:
     ULONG totalRAM;
+    uint32_t nCpus;
 };
 
@@ -81 +83 @@
     else
         totalRAM = (ULONG)(cb / 1024);
+    nCpus = RTMpGetOnlineCount();
+    Assert(nCpus);
+    if (nCpus == 0)
+    {
+        /* It is rather unsual to have no CPUs, but the show must go on. */
+        nCpus = 1;
+    }
 }
 
@@ -143 +152 @@
     if (RT_SUCCESS(rc))
     {
-        *user = tinfo.pti_total_user;
-        *kernel = tinfo.pti_total_system;
+        /*
+         * Adjust user and kernel values so 100% is when ALL cores are fully
+         * utilized (see @bugref{6345}).
+         */
+        *user = tinfo.pti_total_user / nCpus;
+        *kernel = tinfo.pti_total_system / nCpus;
         *total = mach_absolute_time();
     }