Even more details

peter-lawrey · peter-lawrey · commit eb5adba28aee · 2012-01-27T16:37:05.000Z
diff --git a/src/main/java/vanilla/java/affinity/impl/VanillaCpuLayout.java b/src/main/java/vanilla/java/affinity/impl/VanillaCpuLayout.java
@@ -40,11 +40,11 @@ public class VanillaCpuLayout implements CpuLayout {
                 threads = new TreeSet<Integer>();
         for (CpuInfo cpuDetail : cpuDetails) {
             sockets.add(cpuDetail.socketId);
-            cores.add(cpuDetail.coreId);
+            cores.add((cpuDetail.socketId << 16) + cpuDetail.coreId);
             threads.add(cpuDetail.threadId);
         }
         this.sockets = sockets.size();
-        this.coresPerSocket = cores.size();
+        this.coresPerSocket = cores.size() / sockets.size();
         this.threadsPerCore = threads.size();
         if (cpuDetails.size() != sockets() * coresPerSocket() * threadsPerCore()) {
             StringBuilder error = new StringBuilder();
