Merge remote-tracking branch 'origin/develop' into develop

Author: peter-lawrey

README.adoc

@@ -129,21 +129,21 @@ try (final AffinityLock al = AffinityLock.acquireLock()) {
 ----    
 In this example, the library will prefer a free CPU on the same Socket as the first thread, otherwise it will pick any free CPU. 
 
-=== Getting the thread id.
+=== Getting the thread id
 You can get the current thread id using
 [source, java]
 ----
 
 int threadId = AffinitySupport.getThreadId();
 ----
-=== Determining which CPU you are running on.
+=== Determining which CPU you are running on
 You can get the current CPU being used by
 [source, java]
 ----
 
 int cpuId = AffinitySupport.getCpu();
 ----
-=== Controlling the affinity more directly.
+=== Controlling the affinity more directly
 The affinity of the process on start up is
 [source, java]
 ----
@@ -223,7 +223,7 @@ try (AffinityLock lock = AffinityLock.acquireLockLastMinus(n)) {
 
 I have the cpuId in a configuration file, how can I set it using a string?
 
-=== Answer: use one of the following.
+=== Answer: use one of the following
 
 [source,java]
 ----

affinity-test/pom.xml

@@ -26,7 +26,7 @@
     </parent>
 
     <artifactId>affinity-test</artifactId>
-    <version>3.21ea3-SNAPSHOT</version>
+    <version>3.21ea4-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>OpenHFT/Java-Thread-Affinity/affinity-test</name>

affinity/pom.xml

@@ -26,7 +26,7 @@
     </parent>
 
     <artifactId>affinity</artifactId>
-    <version>3.21ea3-SNAPSHOT</version>
+    <version>3.21ea4-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>OpenHFT/Java-Thread-Affinity/affinity</name>

affinity/src/main/java/net/openhft/affinity/AffinityThreadFactory.java

@@ -66,7 +66,8 @@ public void run() {
     }
 
     private synchronized AffinityLock acquireLockBasedOnLast() {
-        AffinityLock al = lastAffinityLock == null ? AffinityLock.acquireLock() : lastAffinityLock.acquireLock(strategies);
+        AffinityLock al = lastAffinityLock == null ? AffinityLock.acquireLock(false) : lastAffinityLock.acquireLock(strategies);
+        al.bind();
         if (al.cpuId() >= 0)
             lastAffinityLock = al;
         return al;

affinity/src/main/java/net/openhft/affinity/impl/WindowsJNAAffinity.java

@@ -25,6 +25,7 @@
 import com.sun.jna.platform.win32.WinDef;
 import com.sun.jna.ptr.LongByReference;
 import net.openhft.affinity.IAffinity;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,6 +43,7 @@ public enum WindowsJNAAffinity implements IAffinity {
     INSTANCE;
     public static final boolean LOADED;
     private static final Logger LOGGER = LoggerFactory.getLogger(WindowsJNAAffinity.class);
+    private static final ThreadLocal<BitSet> currentAffinity = new ThreadLocal<>();
 
     static {
         boolean loaded = false;
@@ -58,26 +60,11 @@ public enum WindowsJNAAffinity implements IAffinity {
 
     @Override
     public BitSet getAffinity() {
-        final CLibrary lib = CLibrary.INSTANCE;
-        final LongByReference cpuset1 = new LongByReference(0);
-        final LongByReference cpuset2 = new LongByReference(0);
-        try {
-
-            final int ret = lib.GetProcessAffinityMask(-1, cpuset1, cpuset2);
-            // Successful result is positive, according to the docs
-            // https://msdn.microsoft.com/en-us/library/windows/desktop/ms683213%28v=vs.85%29.aspx
-            if (ret <= 0) {
-                throw new IllegalStateException("GetProcessAffinityMask(( -1 ), &(" + cpuset1 + "), &(" + cpuset2 + ") ) return " + ret);
-            }
-
-            long[] longs = new long[1];
-            longs[0] = cpuset1.getValue();
-            return BitSet.valueOf(longs);
-        } catch (Exception e) {
-            LOGGER.error(e.getMessage(), e);
-        }
-
-        return new BitSet();
+        BitSet bitSet = currentAffinity.get();
+        if (bitSet != null)
+            return bitSet;
+        BitSet longs = getAffinity0();
+        return longs != null ? longs : new BitSet();
     }
 
     @Override
@@ -103,6 +90,34 @@ public void setAffinity(final BitSet affinity) {
         } catch (LastErrorException e) {
             throw new IllegalStateException("SetThreadAffinityMask((" + pid + ") , &(" + affinity + ") ) errorNo=" + e.getErrorCode(), e);
         }
+        BitSet affinity2 = getAffinity0();
+        if (!affinity2.equals(affinity)) {
+            LoggerFactory.getLogger(WindowsJNAAffinity.class).warn("Tried to set affinity to " + affinity + " but was " + affinity2 + " you may have in sufficient access rights");
+        }
+        currentAffinity.set((BitSet) affinity.clone());
+    }
+
+    @Nullable
+    private BitSet getAffinity0() {
+        final CLibrary lib = CLibrary.INSTANCE;
+        final LongByReference cpuset1 = new LongByReference(0);
+        final LongByReference cpuset2 = new LongByReference(0);
+        try {
+
+            final int ret = lib.GetProcessAffinityMask(-1, cpuset1, cpuset2);
+            // Successful result is positive, according to the docs
+            // https://msdn.microsoft.com/en-us/library/windows/desktop/ms683213%28v=vs.85%29.aspx
+            if (ret <= 0) {
+                throw new IllegalStateException("GetProcessAffinityMask(( -1 ), &(" + cpuset1 + "), &(" + cpuset2 + ") ) return " + ret);
+            }
+
+            long[] longs = new long[1];
+            longs[0] = cpuset1.getValue();
+            return BitSet.valueOf(longs);
+        } catch (Exception e) {
+            LOGGER.error(e.getMessage(), e);
+        }
+        return null;
     }
 
     public int getTid() {

pom.xml

@@ -26,7 +26,7 @@
     </parent>
 
     <artifactId>Java-Thread-Affinity</artifactId>
-    <version>3.21ea3-SNAPSHOT</version>
+    <version>3.21ea4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>OpenHFT/Java-Thread-Affinity Parent</name>