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

Timestamp:

Jan 13, 2014 9:10:18 AM (11 years ago)

Author:

vboxsync

Message:

Runtime/r3/linux: when determining the number of physical cores, also consider the physical package ID of each core

File:

• trunk/src/VBox/Runtime/r3/linux/mp-linux.cpp (modified) (4 diffs)

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

@@ -185 +185 @@
     RTCPUID     cMax      = rtMpLinuxMaxCpus();
     uint32_t   *paidCores = (uint32_t *)alloca(sizeof(paidCores[0]) * (cMax + 1));
+    uint32_t   *paidPckgs = (uint32_t *)alloca(sizeof(paidPckgs[0]) * (cMax + 1));
     uint32_t    cCores    = 0;
     for (RTCPUID idCpu = 0; idCpu < cMax; idCpu++)
@@ -191 +192 @@
         {
             uint32_t idCore = (uint32_t)RTLinuxSysFsReadIntFile(0, "devices/system/cpu/cpu%d/topology/core_id", (int)idCpu);
+            uint32_t idPckg = (uint32_t)RTLinuxSysFsReadIntFile(0, "devices/system/cpu/cpu%d/topology/physical_package_id", (int)idCpu);
             uint32_t i;
             for (i = 0; i < cCores; i++)
-                if (paidCores[i] == idCore)
+                if (   paidCores[i] == idCore
+                    && paidPckgs[i] == idPckg)
                     break;
             if (i >= cCores)
-                paidCores[cCores++] = idCore;
+            {
+                paidCores[cCores] = idCore;
+                paidPckgs[cCores] = idPckg;
+                cCores++;
+            }
         }
     }
@@ -227 +234 @@
     RTCPUID     cMax      = rtMpLinuxMaxCpus();
     uint32_t   *paidCores = (uint32_t *)alloca(sizeof(paidCores[0]) * (cMax + 1));
+    uint32_t   *paidPckgs = (uint32_t *)alloca(sizeof(paidPckgs[0]) * (cMax + 1));
     uint32_t    cCores    = 0;
     for (RTCPUID idCpu = 0; idCpu < cMax; idCpu++)
@@ -233 +241 @@
         {
             uint32_t idCore = (uint32_t)RTLinuxSysFsReadIntFile(0, "devices/system/cpu/cpu%d/topology/core_id", (int)idCpu);
+            uint32_t idPckg = (uint32_t)RTLinuxSysFsReadIntFile(0, "devices/system/cpu/cpu%d/topology/physical_package_id", (int)idCpu);
             uint32_t i;
             for (i = 0; i < cCores; i++)
-                if (paidCores[i] == idCore)
+                if (   paidCores[i] == idCore
+                    && paidPckgs[i] == idPckg)
                     break;
             if (i >= cCores)
-                paidCores[cCores++] = idCore;
+            {
+                paidCores[cCores] = idCore;
+                paidPckgs[cCores] = idPckg;
+                cCores++;
+            }
         }
     }