Changeset 94087 in vbox for trunk/src/VBox/Runtime/r3/darwin

Timestamp:

Mar 4, 2022 2:03:32 PM (3 years ago)

Author:

vboxsync

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

150332

Message:

IPRT/mp/darwin: Reimplemented RTMpGetOnlineSet to avoid getting the same information over and over again for each CPU. Updated comment in RTMpGetCurFrequency explaining how seemingly difficult it would be to implement. Updated todo in RTMpGetDescription. bugref:9898

Location:

trunk/src/VBox/Runtime/r3/darwin

Files:

• RTMpGetDescription-generic.cpp (modified) (1 diff)
• mp-darwin.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r3/darwin/RTMpGetDescription-generic.cpp

@@ -50 +50 @@
      * Just use the sysctl machdep.cpu.brand_string value for now.
      */
-    /** @todo on arm this is very boring, so we could use the cpufamily and
-     *        cpusubfamily instead... */
+    /** @todo on arm this is very boring and there are two different types of
+     *        cores in the system, "E" and "P" cores. The I/O registry can
+     *        be used to find out which @a idCpu is.  There are also codename
+     *        available there. */
     char szBrand[128] = {0};
     size_t cb = sizeof(szBrand);

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

@@ -54 +54 @@
 
 #include <iprt/mp.h>
+#include <iprt/assert.h>
 #include <iprt/cpuset.h>
-#include <iprt/assert.h>
 #include <iprt/log.h>
 #include <iprt/string.h>
@@ -174 +174 @@
 #else
     /** @todo proper ring-3 support on darwin, see @bugref{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 : false;
-    vm_deallocate(mach_task_self(), (vm_address_t)pinfo, count * sizeof(*pinfo));
-    return isOnline;
+    natural_t              cCpus;
+    processor_basic_info_t paInfo;
+    mach_msg_type_number_t cInfo;
+    kern_return_t krc = host_processor_info(mach_host_self(), PROCESSOR_BASIC_INFO,
+                                            &cCpus, (processor_info_array_t*)&paInfo, &cInfo);
+    AssertReturn(krc == KERN_SUCCESS, true);
+    bool const fIsOnline = idCpu < cCpus ? paInfo[idCpu].running : false;
+    vm_deallocate(mach_task_self(), (vm_address_t)paInfo, cInfo * sizeof(paInfo[0]));
+    return fIsOnline;
 #endif
 }
@@ -225 +225 @@
 RTDECL(PRTCPUSET) RTMpGetOnlineSet(PRTCPUSET pSet)
 {
+    RTCpuSetEmpty(pSet);
 #if 0
-    return RTMpGetSet(pSet);
-#else
-    RTCpuSetEmpty(pSet);
     RTCPUID cMax = rtMpDarwinMaxLogicalCpus();
     for (RTCPUID idCpu = 0; idCpu < cMax; idCpu++)
         if (RTMpIsCpuOnline(idCpu))
             RTCpuSetAdd(pSet, idCpu);
+#else
+    natural_t              cCpus  = 0;
+    processor_basic_info_t paInfo = NULL;
+    mach_msg_type_number_t cInfo  = 0;
+    kern_return_t krc = host_processor_info(mach_host_self(), PROCESSOR_BASIC_INFO,
+                                            &cCpus, (processor_info_array_t *)&paInfo, &cInfo);
+    AssertReturn(krc == KERN_SUCCESS, pSet);
+
+    AssertStmt(cCpus <= RTCPUSET_MAX_CPUS, cCpus = RTCPUSET_MAX_CPUS);
+    for (natural_t idCpu = 0; idCpu < cCpus; idCpu++)
+        if (paInfo[idCpu].running)
+            RTCpuSetAdd(pSet, idCpu);
+
+    vm_deallocate(mach_task_self(), (vm_address_t)paInfo, cInfo * sizeof(paInfo[0]));
+#endif
     return pSet;
-#endif
 }
 
@@ -254 +266 @@
 RTDECL(uint32_t) RTMpGetCurFrequency(RTCPUID idCpu)
 {
-    /** @todo figure out how to get the current cpu speed on darwin. Have to check what powermanagement does. */
+    /** @todo figure out how to get the current cpu speed on darwin. Have to
+     *  check what powermanagement does.  The powermetrics uses a private
+     *  IOReportXxxx interface and *seems* (guessing) to calculate the frequency
+     *  based on the frequency distribution over the last report period...  This
+     *  means that it's not really an suitable API for here.  */
     NOREF(idCpu);
     return 0;