儲存庫 vbox 的更動 46144

時間撮記:

2013-5-17 下午02:46:57 (12 年 以前)

作者:

vboxsync

訊息:

Runtime: RTMpGetCoreCount() for Linux

位置:

trunk

檔案:

• include/iprt/mp.h (修改) (1 筆差異)
• src/VBox/Runtime/Makefile.kmk (修改) (6 筆差異)
• src/VBox/Runtime/generic/RTMpGetCoreCount-generic.cpp (新增)
• src/VBox/Runtime/r3/linux/mp-linux.cpp (修改) (1 筆差異)
• src/VBox/Runtime/testcase/tstMp-1.cpp (修改) (1 筆差異)

trunk/include/iprt/mp.h

@@ -117 +117 @@
 RTDECL(RTCPUID) RTMpGetCount(void);
 
+/**
+ * Get the count of phyiscal CPU cores present in the system.
+ */
+RTDECL(RTCPUID) RTMpGetCoreCount(void);
 
 /**

trunk/src/VBox/Runtime/Makefile.kmk

@@ -551 +551 @@
         generic/RTDirSetTimes-generic.cpp \
         generic/RTFileExists-generic.cpp \
+        generic/RTMpGetCoreCount-generic.cpp \
         generic/RTMpGetCurFrequency-generic.cpp \
         generic/RTMpGetMaxFrequency-generic.cpp \
@@ -714 +715 @@
         generic/utf16locale-generic.cpp \
         generic/uuid-generic.cpp \
+        generic/RTMpGetCoreCount-generic.cpp \
         generic/RTMpGetCurFrequency-generic.cpp \
         generic/RTMpGetMaxFrequency-generic.cpp \
@@ -773 +775 @@
         generic/RTUuidCreate-generic.cpp \
         generic/mppresent-generic.cpp \
+        generic/RTMpGetCoreCount-generic.cpp \
         generic/RTSemEventMultiWait-2-ex-generic.cpp \
         generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp \
@@ -845 +848 @@
         generic/uuid-generic.cpp \
         generic/RTMpCpuId-generic.cpp \
+        generic/RTMpGetCoreCount-generic.cpp \
         generic/RTProcDaemonize-generic.cpp \
         generic/RTProcIsRunningByName-generic.cpp \
@@ -905 +909 @@
         generic/RTTimerCreate-generic.cpp \
         generic/RTUuidCreate-generic.cpp \
+        generic/RTMpGetCoreCount-generic.cpp \
         generic/sched-generic.cpp \
         generic/utf16locale-generic.cpp \
@@ -981 +986 @@
         generic/RTProcIsRunningByName-generic.cpp \
         generic/RTThreadGetNativeState-generic.cpp \
+        generic/RTMpGetCoreCount-generic.cpp \
         r3/haiku/rtProcInitExePath-haiku.cpp \
         r3/haiku/time-haiku.cpp \

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

@@ -178 +178 @@
 
 
+RTDECL(RTCPUID) RTMpGetCoreCount(void)
+{
+    RTCPUID cMax = rtMpLinuxMaxCpus();
+    uint32_t aCores[256];
+    RT_ZERO(aCores);
+    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;
+            for (i = 0; i < cCores; i++)
+                if (aCores[i] == idCore)
+                    break;
+            if (   i >= cCores
+                && cCores < RT_ELEMENTS(aCores))
+            {
+                aCores[cCores] = idCore;
+                cCores++;
+            }
+        }
+    }
+    return cCores;
+}
+
+
 RTDECL(PRTCPUSET) RTMpGetOnlineSet(PRTCPUSET pSet)
 {

trunk/src/VBox/Runtime/testcase/tstMp-1.cpp

@@ -60 +60 @@
     }
 
+    RTCPUID cCoreCpus = RTMpGetCoreCount();
+    if (cCoreCpus > 0)
+        RTPrintf("tstMp-1: RTMpGetCoreCount -> %d\n", (int)cCoreCpus);
+    else
+    {
+        RTPrintf("tstMp-1: FAILURE: RTMpGetCoreCount -> %d\n", (int)cCoreCpus);
+        g_cErrors++;
+        cCoreCpus = 1;
+    }
+
     RTCPUSET Set;
     PRTCPUSET pSet = RTMpGetSet(&Set);