Changeset 46639 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jun 18, 2013 5:33:09 PM (12 years ago)

Author:

vboxsync

Message:

Added RTMpGetOnlineCoreCount and RTMpGetPresentCoreCount.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (5 diffs)
• generic/RTMpGetCoreCount-generic.cpp (modified) (2 diffs)
• generic/RTMpGetOnlineCoreCount-generic.cpp (copied) (copied from trunk/src/VBox/Runtime/generic/RTMpGetCoreCount-generic.cpp ) (1 diff)
• generic/mppresent-generic.cpp (modified) (1 diff)
• r3/linux/mp-linux.cpp (modified) (3 diffs)
• r3/win/mp-win.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -732 +732 @@
         generic/uuid-generic.cpp \
         generic/RTMpGetCoreCount-generic.cpp \
+        generic/RTMpGetOnlineCoreCount-generic.cpp \
         generic/RTMpGetCurFrequency-generic.cpp \
         generic/RTMpGetMaxFrequency-generic.cpp \
@@ -793 +794 @@
         generic/mppresent-generic.cpp \
         generic/RTMpGetCoreCount-generic.cpp \
+        generic/RTMpGetOnlineCoreCount-generic.cpp \
         generic/RTSemEventMultiWait-2-ex-generic.cpp \
         generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp \
@@ -867 +869 @@
         generic/RTMpCpuId-generic.cpp \
         generic/RTMpGetCoreCount-generic.cpp \
+        generic/RTMpGetOnlineCoreCount-generic.cpp \
         generic/RTProcDaemonize-generic.cpp \
         generic/RTProcIsRunningByName-generic.cpp \
@@ -929 +932 @@
         generic/RTUuidCreate-generic.cpp \
         generic/RTMpGetCoreCount-generic.cpp \
+        generic/RTMpGetOnlineCoreCount-generic.cpp \
         generic/sched-generic.cpp \
         generic/utf16locale-generic.cpp \
@@ -1007 +1011 @@
         generic/RTThreadGetNativeState-generic.cpp \
         generic/RTMpGetCoreCount-generic.cpp \
+        generic/RTMpGetOnlineCoreCount-generic.cpp \
         r3/haiku/rtProcInitExePath-haiku.cpp \
         r3/haiku/time-haiku.cpp \

trunk/src/VBox/Runtime/generic/RTMpGetCoreCount-generic.cpp

@@ -30 +30 @@
 *******************************************************************************/
 #include <iprt/mp.h>
-#include <internal/iprt.h>
+#include "internal/iprt.h"
 
 
@@ -38 +38 @@
 }
 RT_EXPORT_SYMBOL(RTMpGetCoreCount);
+

trunk/src/VBox/Runtime/generic/RTMpGetOnlineCoreCount-generic.cpp

@@ -30 +30 @@
 *******************************************************************************/
 #include <iprt/mp.h>
-#include <internal/iprt.h>
+#include "internal/iprt.h"
 
 
-RTDECL(RTCPUID) RTMpGetCoreCount(void)
+RTDECL(RTCPUID) RTMpGetOnlineCoreCount(void)
 {
-    return RTMpGetCount();
+    return RTMpGetOnlineCount();
 }
-RT_EXPORT_SYMBOL(RTMpGetCoreCount);
+RT_EXPORT_SYMBOL(RTMpGetOnlineCoreCount);
+

trunk/src/VBox/Runtime/generic/mppresent-generic.cpp

@@ -47 +47 @@
 
 
+RTDECL(RTCPUID) RTMpGetPresentCoreCount(void)
+{
+    return RTMpGetCoreCount();
+}
+RT_EXPORT_SYMBOL(RTMpGetPresentCoreCount);
+
+
 RTDECL(bool) RTMpIsCpuPresent(RTCPUID idCpu)
 {

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

@@ -34 +34 @@
 
 #include <iprt/mp.h>
+#include "internal/iprt.h"
+
+#include <iprt/alloca.h>
 #include <iprt/cpuset.h>
 #include <iprt/assert.h>
@@ -180 +183 @@
 RTDECL(RTCPUID) RTMpGetCoreCount(void)
 {
-    RTCPUID cMax = rtMpLinuxMaxCpus();
-    uint32_t aCores[256];
-    RT_ZERO(aCores);
-    uint32_t cCores = 0;
+    RTCPUID     cMax      = rtMpLinuxMaxCpus();
+    uint32_t   *paidCores = (uint32_t *)alloca(sizeof(*uint32_t) * (cMax + 1));
+    uint32_t    cCores    = 0;
     for (RTCPUID idCpu = 0; idCpu < cMax; idCpu++)
     {
         if (RTMpIsCpuPossible(idCpu))
         {
-            uint32_t idCore =
-                (uint32_t)RTLinuxSysFsReadIntFile(0, "devices/system/cpu/cpu%d/topology/core_id", (int)idCpu);
-            unsigned i;
+            uint32_t idCore = (uint32_t)RTLinuxSysFsReadIntFile(0, "devices/system/cpu/cpu%d/topology/core_id", (int)idCpu);
+            uint32_t i;
             for (i = 0; i < cCores; i++)
-                if (aCores[i] == idCore)
+                if (paidCores[i] == idCore)
                     break;
-            if (   i >= cCores
-                && cCores < RT_ELEMENTS(aCores))
-            {
-                aCores[cCores] = idCore;
-                cCores++;
-            }
-        }
-    }
+            if (i >= cCores)
+                paidCores[cCores++] = idCore;
+        }
+    }
+    Assert(cCores > 0);
     return cCores;
 }
@@ -223 +221 @@
     return RTCpuSetCount(&Set);
 }
+
+
+RTDECL(RTCPUID) RTMpGetOnlineCoreCount(void)
+{
+    RTCPUID     cMax      = rtMpLinuxMaxCpus();
+    uint32_t   *paidCores = (uint32_t *)alloca(sizeof(*uint32_t) * (cMax + 1));
+    uint32_t    cCores    = 0;
+    for (RTCPUID idCpu = 0; idCpu < cMax; idCpu++)
+    {
+        if (RTMpIsCpuOnline(idCpu))
+        {
+            uint32_t idCore = (uint32_t)RTLinuxSysFsReadIntFile(0, "devices/system/cpu/cpu%d/topology/core_id", (int)idCpu);
+            uint32_t i;
+            for (i = 0; i < cCores; i++)
+                if (paidCores[i] == idCore)
+                    break;
+            if (i >= cCores)
+                paidCores[cCores++] = idCore;
+        }
+    }
+    Assert(cCores > 0);
+    return cCores;
+}
+
 
 

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

@@ -166 +166 @@
 }
 
+
+RTDECL(RTCPUID) RTMpGetOnlineCoreCount(void)
+{
+    /** @todo this isn't entirely correct. */
+    return RTMpGetCoreCount();
+}
+