Changeset 11810 in vbox

Timestamp:

Aug 29, 2008 11:52:39 AM (16 years ago)

Author:

vboxsync

Message:

RTMpIsCpuOnline() for Darwin

Location:

trunk/src/VBox

Files:

• Main/Performance.cpp (modified) (3 diffs)
• Runtime/r3/darwin/mp-darwin.cpp (modified) (3 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();
-
-    if (nProcessors == 0)
-        return VERR_NOT_IMPLEMENTED;
-
-    uint64_t uTotalMHz  = 0;
-
-    for (RTCPUID i = 0; i < nProcessors; ++i)
-        uTotalMHz += RTMpGetCurFrequency(RTMpCpuIdFromSetIndex(i));
-
-    *mhz = (ULONG)(uTotalMHz / nProcessors);
-
-#else
     unsigned cCpus = 0;
     uint64_t u64TotalMHz = 0;
@@ -114 +100 @@
     RTMpGetOnlineSet(&OnlineSet);
     for (RTCPUID iCpu = 0; iCpu < RTCPUSET_MAX_CPUS; iCpu++)
-        Log4(("{%p} " LOG_FN_FMT ": Checking if CPU %d is member of online set...\n",
+    {
+        LogAleksey(("{%p} " LOG_FN_FMT ": Checking if CPU %d is member of online set...\n",
                     this, __PRETTY_FUNCTION__, (int)iCpu));
         if (RTCpuSetIsMemberByIndex(&OnlineSet, iCpu))
         {
-            Log4(("{%p} " LOG_FN_FMT ": Getting frequency for CPU %d...\n",
+            LogAleksey(("{%p} " LOG_FN_FMT ": Getting frequency for CPU %d...\n",
                         this, __PRETTY_FUNCTION__, (int)iCpu));
             uint32_t uMHz = RTMpGetCurFrequency(RTMpCpuIdFromSetIndex(iCpu));
             if (uMHz != 0)
             {
-                Log4(("{%p} " LOG_FN_FMT ": CPU %d %u MHz\n",
+                LogAleksey(("{%p} " LOG_FN_FMT ": CPU %d %u MHz\n",
                             this, __PRETTY_FUNCTION__, (int)iCpu, uMHz));
                 u64TotalMHz += uMHz;
@@ -129 +116 @@
             }
         }
+    }
 
      AssertReturn(cCpus, VERR_NOT_IMPLEMENTED);
      *mhz = (ULONG)(u64TotalMHz / cCpus);
-#endif
 
     return VINF_SUCCESS;

trunk/src/VBox/Runtime/r3/darwin/mp-darwin.cpp

@@ -42 +42 @@
 #include <sys/fcntl.h>
 #include <errno.h>
+#include <mach/mach.h>
 
 #include <iprt/mp.h>
@@ -91 +92 @@
 RTDECL(bool) RTMpIsCpuOnline(RTCPUID idCpu)
 {
-#if 1
+#if 0
     return RTMpIsCpuPossible(idCpu);
 #else
     /** @todo proper ring-3 support on darwin, see #3014. */
+    natural_t nCpus;
+    processor_basic_info_t pinfo;
+    mach_msg_type_number_t count;
+    kern_return_t krc = host_processor_info(mach_host_self(),
+        PROCESSOR_BASIC_INFO, &nCpus, (processor_info_array_t*)&pinfo, &count);
+    AssertReturn (krc == KERN_SUCCESS, true);
+    bool isOnline = idCpu < nCpus ? pinfo[idCpu].running : true;
+    vm_deallocate(mach_task_self(), (vm_address_t)pinfo, count * sizeof(*pinfo));
+    return isOnline;
 #endif
 }
@@ -131 +141 @@
 RTDECL(PRTCPUSET) RTMpGetOnlineSet(PRTCPUSET pSet)
 {
-#if 1
+#if 0
     return RTMpGetSet(pSet);
 #else