Fix an issue in Centos 7 where the Runtime.availableProcessors() actually gives you the number usable (not isolated) unlike other linux versions/older JVMs.

peter-lawrey · peter-lawrey · commit 37314c37ba30 · 2017-09-07T23:46:57.000+01:00
diff --git a/affinity/src/main/java/net/openhft/affinity/AffinityLock.java b/affinity/src/main/java/net/openhft/affinity/AffinityLock.java
@@ -40,20 +40,30 @@ public class AffinityLock implements Closeable {
     public static final String AFFINITY_RESERVED = "affinity.reserved";
     // TODO It seems like on virtualized platforms .availableProcessors() value can change at
     // TODO runtime. We should think about how to adopt to such change
-    public static final int PROCESSORS = Runtime.getRuntime().availableProcessors();
-    public static final BitSet BASE_AFFINITY = Affinity.getAffinity();
-    public static final BitSet RESERVED_AFFINITY = getReservedAffinity0();
+    public static final int PROCESSORS;
+
+    public static final BitSet BASE_AFFINITY;
+    public static final BitSet RESERVED_AFFINITY;
     private static final Logger LOGGER = LoggerFactory.getLogger(AffinityLock.class);
-    private static final LockInventory LOCK_INVENTORY = new LockInventory(new NoCpuLayout(PROCESSORS));
+    private static final LockInventory LOCK_INVENTORY;
 
     static {
+        int processors = Runtime.getRuntime().availableProcessors();
+        VanillaCpuLayout cpuLayout = null;
         try {
             if (new File("/proc/cpuinfo").exists()) {
-                cpuLayout(VanillaCpuLayout.fromCpuInfo());
+                cpuLayout = VanillaCpuLayout.fromCpuInfo();
+                processors = cpuLayout.cpus();
             }
         } catch (IOException e) {
             LOGGER.warn("Unable to load /proc/cpuinfo", e);
         }
+        PROCESSORS = processors;
+        BASE_AFFINITY = Affinity.getAffinity();
+        RESERVED_AFFINITY = getReservedAffinity0();
+        LOCK_INVENTORY = new LockInventory(new NoCpuLayout(PROCESSORS));
+        if (cpuLayout != null)
+            LOCK_INVENTORY.set(cpuLayout);
     }
 
     /**
diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>Java-Thread-Affinity</artifactId>
-    <version>3.0.6-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>OpenHFT/Java-Thread-Affinity Parent</name>
