Merge branch 'master' of github.com:OpenHFT/Java-Thread-Affinity

epickrram · epickrram · commit 1716c02d4b6f · 2018-01-11T11:58:12.000Z
diff --git a/affinity/src/main/java/net/openhft/affinity/AffinityLock.java b/affinity/src/main/java/net/openhft/affinity/AffinityLock.java
@@ -62,9 +62,7 @@ public class AffinityLock implements Closeable {
         PROCESSORS = processors;
         BASE_AFFINITY = Affinity.getAffinity();
         RESERVED_AFFINITY = getReservedAffinity0();
-        LOCK_INVENTORY = new LockInventory(new NoCpuLayout(PROCESSORS));
-        if (cpuLayout != null)
-            LOCK_INVENTORY.set(cpuLayout);
+        LOCK_INVENTORY = new LockInventory(cpuLayout == null ? new NoCpuLayout(PROCESSORS) : cpuLayout);
     }
 
     /**
diff --git a/affinity/src/main/java/net/openhft/affinity/AffinityThreadFactory.java b/affinity/src/main/java/net/openhft/affinity/AffinityThreadFactory.java
@@ -21,6 +21,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * This is a ThreadFactory which assigns threads based the strategies provided.
@@ -56,17 +57,19 @@ public synchronized Thread newThread(@NotNull final Runnable r) {
         Thread t = new Thread(new Runnable() {
             @Override
             public void run() {
-                AffinityLock al = lastAffinityLock == null ? AffinityLock.acquireLock() : lastAffinityLock.acquireLock(strategies);
-                try {
-                    if (al.cpuId() >= 0)
-                        lastAffinityLock = al;
+                try (AffinityLock ignored = acquireLockBasedOnLast()) {
                     r.run();
-                } finally {
-                    al.release();
                 }
             }
         }, name2);
         t.setDaemon(daemon);
         return t;
     }
+
+    private synchronized AffinityLock acquireLockBasedOnLast() {
+        AffinityLock al = lastAffinityLock == null ? AffinityLock.acquireLock() : lastAffinityLock.acquireLock(strategies);
+        if (al.cpuId() >= 0)
+            lastAffinityLock = al;
+        return al;
+    }
 }
diff --git a/affinity/src/test/java/net/openhft/affinity/AffinityLockTest.java b/affinity/src/test/java/net/openhft/affinity/AffinityLockTest.java
@@ -38,7 +38,6 @@
 /**
  * @author peter.lawrey
  */
-@SuppressWarnings("ALL")
 public class AffinityLockTest {
     private static final Logger logger = LoggerFactory.getLogger(AffinityLockTest.class);
 
@@ -177,7 +176,7 @@ public void testIssue19() {
         System.out.println("AffinityLock.PROCESSORS=" + AffinityLock.PROCESSORS);
 
         AffinityLock al = AffinityLock.acquireLock();
-        List<AffinityLock> locks = new ArrayList<AffinityLock>();
+        List<AffinityLock> locks = new ArrayList<>();
         locks.add(al);
         for (int i = 0; i < 256; i++)
             locks.add(al = al.acquireLock(AffinityStrategies.DIFFERENT_SOCKET,
@@ -199,8 +198,7 @@ public void testAffinity() throws InterruptedException {
         // System.out.println("Started");
         logger.info("Started");
         displayStatus();
-        final AffinityLock al = AffinityLock.acquireLock();
-        try {
+        try (AffinityLock al = AffinityLock.acquireLock()) {
             System.out.println("Main locked");
             displayStatus();
             Thread t = new Thread(new Runnable() {
@@ -216,8 +214,6 @@ public void run() {
             t.join();
             System.out.println("Thread-0 unlocked");
             displayStatus();
-        } finally {
-            al.close();
         }
         System.out.println("All unlocked");
         displayStatus();
diff --git a/affinity/src/test/java/net/openhft/affinity/impl/AbstractAffinityImplTest.java b/affinity/src/test/java/net/openhft/affinity/impl/AbstractAffinityImplTest.java
@@ -70,11 +70,9 @@ public void setAffinityCompletesGracefully() {
     }
 
     @Test
-    @Ignore("TODO FIX")
     public void getAffinityReturnsValuePreviouslySet() {
         final IAffinity impl = getImpl();
-        final int cores = CORES;
-        for (int core = 0; core < cores; core++) {
+        for (int core = 0; core < CORES; core++) {
             final BitSet mask = new BitSet();
             mask.set(core, true);
             getAffinityReturnsValuePreviouslySet(impl, mask);
