Remove lock files after release. Fixes OpenHFT#42.

epickrram · epickrram · commit b91101c07c56 · 2018-01-04T10:15:10.000Z
diff --git a/affinity/src/main/java/net/openhft/affinity/LockInventory.java b/affinity/src/main/java/net/openhft/affinity/LockInventory.java
@@ -21,6 +21,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.NavigableMap;
 import java.util.TreeMap;
 
@@ -154,16 +157,9 @@ public final synchronized void release() {
         for (AffinityLock al : logicalCoreLocks) {
             Thread at = al.assignedThread;
             if (at == t) {
-                LOGGER.info("Releasing cpu {} from {}", al.cpuId(), t);
-                al.assignedThread = null;
-                al.bound = false;
-                al.boundHere = null;
-
+                releaseAffinityLock(t, al, "Releasing cpu {} from {}");
             } else if (at != null && !at.isAlive()) {
-                LOGGER.warn("Releasing cpu {} from {} as it is not alive.", al.cpuId(), t);
-                al.assignedThread = null;
-                al.bound = false;
-                al.boundHere = null;
+                releaseAffinityLock(t, al, "Releasing cpu {} from {} as it is not alive.");
             }
         }
         Affinity.resetToBaseAffinity();
@@ -186,4 +182,18 @@ private void reset(CpuLayout cpuLayout) {
     private int toPhysicalCore(int layoutId) {
         return cpuLayout.socketId(layoutId) * cpuLayout.coresPerSocket() + cpuLayout.coreId(layoutId);
     }
+
+    private void releaseAffinityLock(final Thread t, final AffinityLock al, final String format) {
+        LOGGER.info(format, al.cpuId(), t);
+        al.assignedThread = null;
+        al.bound = false;
+        al.boundHere = null;
+
+        final String lockFilePath = LockCheck.toFile(al.cpuId()).getAbsolutePath();
+        try {
+            Files.delete(Paths.get(lockFilePath));
+        } catch (IOException e) {
+            LOGGER.warn("Failed to delete lock file at " + lockFilePath);
+        }
+    }
 }
diff --git a/affinity/src/test/java/net/openhft/affinity/AffinityLockTest.java b/affinity/src/test/java/net/openhft/affinity/AffinityLockTest.java
@@ -24,11 +24,15 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertThat;
 
 /**
  * @author peter.lawrey
@@ -218,6 +222,17 @@ public void run() {
         displayStatus();
     }
 
+    @Test
+    public void lockFilesShouldBeRemovedOnRelease() {
+        final AffinityLock lock = AffinityLock.acquireLock();
+
+        assertThat(Files.exists(Paths.get(LockCheck.toFile(lock.cpuId()).getAbsolutePath())), is(true));
+
+        lock.release();
+
+        assertThat(Files.exists(Paths.get(LockCheck.toFile(lock.cpuId()).getAbsolutePath())), is(false));
+    }
+
     private void displayStatus() {
         System.out.println(Thread.currentThread() + " on " + Affinity.getCpu() + "\n" + AffinityLock.dumpLocks());
     }
