Changeset 11591 in vbox

Timestamp:

Aug 23, 2008 4:28:29 AM (17 years ago)

Author:

vboxsync

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

35220

Message:

r=bird: Added a review todo in CollectorHAL::getHostCpuMHz - bogus MP programming.

File:

• trunk/src/VBox/Main/Performance.cpp (modified) (6 diffs)

trunk/src/VBox/Main/Performance.cpp

@@ -95 +95 @@
 int CollectorHAL::getHostCpuMHz(ULONG *mhz)
 {
+#if 1 /** @todo r=bird: this isn't taking offline cpus and gaps into account. The result may be way too low. Suggestion in the disabled #else case. */
     RTCPUID nProcessors = RTMpGetCount();
 
@@ -106 +107 @@
 
     *mhz = (ULONG)(uTotalMHz / nProcessors);
+
+#else
+    unsigned cCpus = 0;
+    uint64_t u64TotalMHz = 0;
+    RTCPUSET OnlineSet;
+    RTMpGetOnlineSet(&OnlineSet);
+    for (RTCPUID iCpu = 0; iCpu < RTCPUSET_MAX_CPUS; iCpu++)
+        if (RTCpuSetIsMemberByIndex(&OnlineSet, iCpu))
+        {
+            uint32_t uMHz = RTMpGetCurFrequency(RTMpCpuIdFromSetIndex(iCpu));
+            if (uMHz != 0)
+            {
+                u64TotalMHz += uMHz;
+                cCpus++;
+            }
+        }
+
+     AssertReturn(cCpus, VERR_NOT_IMPLEMENTED);
+     *mhz = (ULONG)(u64TotalMHz / cCpus);
+#endif
+
     return VINF_SUCCESS;
 }
@@ -116 +138 @@
         {
             mLastSampleTaken = nowAt;
-            Log4(("{%p} " LOG_FN_FMT ": Collecting %s for obj(%p)...\n", 
+            Log4(("{%p} " LOG_FN_FMT ": Collecting %s for obj(%p)...\n",
                         this, __PRETTY_FUNCTION__, getName(), (void *)mObject));
             collect();
@@ -178 +200 @@
             mIdle->put((ULONG)(PM_CPU_LOAD_MULTIPLIER * idleDiff / totalDiff));
         }
-    
+
         mUserPrev   = user;
         mKernelPrev = kernel;
@@ -260 +282 @@
             mKernel->put((ULONG)(PM_CPU_LOAD_MULTIPLIER * (processKernel - mProcessKernelPrev ) / (hostTotal - mHostTotalPrev)));
         }
-    
+
         mHostTotalPrev     = hostTotal;
         mProcessUserPrev   = processUser;
@@ -330 +352 @@
     copyTo(data);
 }
-    
+
 void Metric::query(ULONG **data, ULONG *count)
 {