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

Timestamp:

Jul 11, 2013 2:31:35 PM (12 years ago)

Author:

vboxsync

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

87175

Message:

Runtime/darwin: implemented RTMpGetCoreCount()

File:

• trunk/src/VBox/Runtime/r3/darwin/mp-darwin.cpp (modified) (8 diffs)

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

@@ -47 +47 @@
 
 /**
- * Internal worker that determines the max possible CPU count.
- *
- * @returns Max cpus.
- */
-static RTCPUID rtMpDarwinMaxCpus(void)
-{
-    int aiMib[2];
-    aiMib[0] = CTL_HW;
-    aiMib[1] = HW_NCPU;
-    int cCpus = -1;
-    size_t cb = sizeof(cCpus);
-    int rc = sysctl(aiMib, RT_ELEMENTS(aiMib), &cCpus, &cb, NULL, 0);
+ * Internal worker that determines the max possible logical CPU count (hyperthreads).
+ *
+ * @returns Max cpus.
+ */
+static RTCPUID rtMpDarwinMaxLogicalCpus(void)
+{
+    int cCpus = -1;
+    size_t cb = sizeof(cCpus);
+    int rc = sysctlbyname("hw.logicalcpu_max", &cCpus, &cb, NULL, 0);
+    if (rc != -1 && cCpus >= 1)
+        return cCpus;
+    AssertFailed();
+    return 1;
+}
+
+/**
+ * Internal worker that determines the max possible physical core count.
+ *
+ * @returns Max cpus.
+ */
+static RTCPUID rtMpDarwinMaxPhysicalCpus(void)
+{
+    int cCpus = -1;
+    size_t cb = sizeof(cCpus);
+    int rc = sysctlbyname("hw.physicalcpu_max", &cCpus, &cb, NULL, 0);
+    if (rc != -1 && cCpus >= 1)
+        return cCpus;
+    AssertFailed();
+    return 1;
+}
+
+/**
+ * Internal worker that determines the current number of logical CPUs (hyperthreads).
+ *
+ * @returns Max cpus.
+ */
+static RTCPUID rtMpDarwinOnlineLogicalCpus(void)
+{
+    int cCpus = -1;
+    size_t cb = sizeof(cCpus);
+    int rc = sysctlbyname("hw.logicalcpu", &cCpus, &cb, NULL, 0);
+    if (rc != -1 && cCpus >= 1)
+        return cCpus;
+    AssertFailed();
+    return 1;
+}
+
+/**
+ * Internal worker that determines the current number of physical CPUs.
+ *
+ * @returns Max cpus.
+ */
+static RTCPUID rtMpDarwinOnlinePhysicalCpus(void)
+{
+    int cCpus = -1;
+    size_t cb = sizeof(cCpus);
+    int rc = sysctlbyname("hw.physicalcpu", &cCpus, &cb, NULL, 0);
     if (rc != -1 && cCpus >= 1)
         return cCpus;
@@ -70 +115 @@
 RTDECL(int) RTMpCpuIdToSetIndex(RTCPUID idCpu)
 {
-    return idCpu < RTCPUSET_MAX_CPUS && idCpu < rtMpDarwinMaxCpus() ? idCpu : -1;
+    return idCpu < RTCPUSET_MAX_CPUS && idCpu < rtMpDarwinMaxLogicalCpus() ? idCpu : -1;
 }
 
@@ -76 +121 @@
 RTDECL(RTCPUID) RTMpCpuIdFromSetIndex(int iCpu)
 {
-    return (unsigned)iCpu < rtMpDarwinMaxCpus() ? iCpu : NIL_RTCPUID;
+    return (unsigned)iCpu < rtMpDarwinMaxLogicalCpus() ? iCpu : NIL_RTCPUID;
 }
 
@@ -82 +127 @@
 RTDECL(RTCPUID) RTMpGetMaxCpuId(void)
 {
-    return rtMpDarwinMaxCpus() - 1;
+    return rtMpDarwinMaxLogicalCpus() - 1;
 }
 
@@ -108 +153 @@
 {
     return idCpu != NIL_RTCPUID
-        && idCpu < rtMpDarwinMaxCpus();
+        && idCpu < rtMpDarwinMaxLogicalCpus();
 }
 
@@ -115 +160 @@
 {
 #if 0
-    RTCPUID cCpus = rtMpDarwinMaxCpus();
+    RTCPUID cCpus = rtMpDarwinMaxLogicalCpus();
     return RTCpuSetFromU64(RT_BIT_64(cCpus) - 1);
 
 #else
     RTCpuSetEmpty(pSet);
-    RTCPUID cMax = rtMpDarwinMaxCpus();
+    RTCPUID cMax = rtMpDarwinMaxLogicalCpus();
     for (RTCPUID idCpu = 0; idCpu < cMax; idCpu++)
         if (RTMpIsCpuPossible(idCpu))
@@ -131 +176 @@
 RTDECL(RTCPUID) RTMpGetCount(void)
 {
-    return rtMpDarwinMaxCpus();
+    return rtMpDarwinMaxLogicalCpus();
+}
+
+
+RTDECL(RTCPUID) RTMpGetCoreCount(void)
+{
+    return rtMpDarwinMaxPhysicalCpus();
 }
 
@@ -141 +192 @@
 #else
     RTCpuSetEmpty(pSet);
-    RTCPUID cMax = rtMpDarwinMaxCpus();
+    RTCPUID cMax = rtMpDarwinMaxLogicalCpus();
     for (RTCPUID idCpu = 0; idCpu < cMax; idCpu++)
         if (RTMpIsCpuOnline(idCpu))