Handle ClosedByInterruptException for when acquireLock() is interrupted #92

Author: peter-lawrey

affinity-test/pom.xml

@@ -26,7 +26,7 @@
     </parent>
 
     <artifactId>affinity-test</artifactId>
-    <version>3.21ea84-SNAPSHOT</version>
+    <version>3.23ea0-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.21ea84-SNAPSHOT</version>
+    <version>3.23ea0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>OpenHFT/Java-Thread-Affinity/affinity</name>

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

@@ -23,6 +23,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.nio.channels.ClosedByInterruptException;
 import java.util.NavigableMap;
 import java.util.TreeMap;
 
@@ -78,12 +79,15 @@ private static boolean isAnyCpu(final int cpuId) {
      * @param wholeCore Whether to bind the whole core
      * @return true if the lock was acquired, false otherwise
      */
-    private static boolean updateLockForCurrentThread(final boolean bind, final AffinityLock al, final boolean wholeCore) {
+    private static boolean updateLockForCurrentThread(final boolean bind, final AffinityLock al, final boolean wholeCore) throws ClosedByInterruptException {
         try {
             if (LockCheck.updateCpu(al.cpuId())) {
                 al.assignCurrentThread(bind, wholeCore);
                 return true;
             }
+        } catch (ClosedByInterruptException e) {
+            throw e;
+
         } catch (IOException e) {
             LOGGER.warn("Error occurred acquiring lock", e);
         }
@@ -120,30 +124,36 @@ public final synchronized AffinityLock acquireLock(boolean bind, int cpuId, Affi
             return noLock();
 
         final boolean specificCpuRequested = !isAnyCpu(cpuId);
-        if (specificCpuRequested && cpuId != 0) {
-            final AffinityLock required = logicalCoreLocks[cpuId];
-            if (required.canReserve(true)
-                    && anyStrategyMatches(cpuId, cpuId, strategies)
-                    && updateLockForCurrentThread(bind, required, false)) {
-                return required;
+        try {
+            if (specificCpuRequested && cpuId != 0) {
+                final AffinityLock required = logicalCoreLocks[cpuId];
+                if (required.canReserve(true)
+                        && anyStrategyMatches(cpuId, cpuId, strategies)
+                        && updateLockForCurrentThread(bind, required, false)) {
+                    return required;
+                }
+                LOGGER.warn("Unable to acquire lock on CPU {} for thread {}, trying to find another CPU",
+                        cpuId, Thread.currentThread());
             }
-            LOGGER.warn("Unable to acquire lock on CPU {} for thread {}, trying to find another CPU",
-                    cpuId, Thread.currentThread());
-        }
 
-        for (AffinityStrategy strategy : strategies) {
-            // consider all processors except cpu 0 which is usually used by the OS.
-            // if you have only one core, this library is not appropriate in any case.
-            for (int i = logicalCoreLocks.length - 1; i > 0; i--) {
-                AffinityLock al = logicalCoreLocks[i];
-                if (al.canReserve(false)
-                        && (isAnyCpu(cpuId) || strategy.matches(cpuId, al.cpuId()))
-                        && updateLockForCurrentThread(bind, al, false)) {
-                    return al;
+            for (AffinityStrategy strategy : strategies) {
+                // consider all processors except cpu 0 which is usually used by the OS.
+                // if you have only one core, this library is not appropriate in any case.
+                for (int i = logicalCoreLocks.length - 1; i > 0; i--) {
+                    AffinityLock al = logicalCoreLocks[i];
+                    if (al.canReserve(false)
+                            && (isAnyCpu(cpuId) || strategy.matches(cpuId, al.cpuId()))
+                            && updateLockForCurrentThread(bind, al, false)) {
+                        return al;
+                    }
                 }
             }
+        } catch (ClosedByInterruptException e) {
+            Thread.currentThread().interrupt();
+            return noLock();
         }
 
+
         LOGGER.warn("No reservable CPU for {}", Thread.currentThread());
 
         return noLock();
@@ -154,11 +164,17 @@ public final synchronized AffinityLock tryAcquireLock(boolean bind, int cpuId) {
             return null;
 
         final AffinityLock required = logicalCoreLocks[cpuId];
-        if (required.canReserve(true)
-                && updateLockForCurrentThread(bind, required, false)) {
-            return required;
+        try {
+            if (required.canReserve(true)
+                    && updateLockForCurrentThread(bind, required, false)) {
+                return required;
+            }
+        } catch (ClosedByInterruptException e) {
+            Thread.currentThread().interrupt();
+            return noLock();
         }
 
+
         LOGGER.warn("Unable to acquire lock on CPU {} for thread {}, trying to find another CPU",
                 cpuId, Thread.currentThread());
 
@@ -174,9 +190,14 @@ public final synchronized AffinityLock acquireCore(boolean bind, int cpuId, Affi
                         continue LOOP;
 
                 final AffinityLock al = als[0];
+                try {
                 if (updateLockForCurrentThread(bind, al, true)) {
                     return al;
                 }
+                } catch (ClosedByInterruptException e) {
+                    Thread.currentThread().interrupt();
+                    return noLock();
+                }
             }
         }
 

pom.xml

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