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

Timestamp:

Jan 30, 2013 2:16:31 PM (12 years ago)

Author:

vboxsync

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

83474

Message:

Main/Metrics: Per-VM CPU load on Darwin brought in line with other platforms (#6345)

File:

• trunk/src/VBox/Main/src-server/darwin/PerformanceDarwin.cpp (modified) (2 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>
@@ -98 +99 @@
     }
 
-    *user = (uint64_t)info.cpu_ticks[CPU_STATE_USER]
-                    + info.cpu_ticks[CPU_STATE_NICE];
-    *kernel = (uint64_t)info.cpu_ticks[CPU_STATE_SYSTEM];
-    *idle = (uint64_t)info.cpu_ticks[CPU_STATE_IDLE];
+    int nCpus = RTMpGetOnlineCount();
+    Assert(nCpus);
+    if (nCpus)
+    {
+        *user = ((uint64_t)info.cpu_ticks[CPU_STATE_USER]
+                 + info.cpu_ticks[CPU_STATE_NICE]) / nCpus;
+        *kernel = ((uint64_t)info.cpu_ticks[CPU_STATE_SYSTEM]) / nCpus;
+        *idle = ((uint64_t)info.cpu_ticks[CPU_STATE_IDLE]) / nCpus;
+    }
+    else
+    {
+        /* It is rather unsual to have no CPUs, but the show must go on. */
+        *user = (uint64_t)info.cpu_ticks[CPU_STATE_USER]
+            + info.cpu_ticks[CPU_STATE_NICE];
+        *kernel = (uint64_t)info.cpu_ticks[CPU_STATE_SYSTEM];
+        *idle = (uint64_t)info.cpu_ticks[CPU_STATE_IDLE];
+    }
+
     return VINF_SUCCESS;
 }