peter-lawrey#21 Ensure un-bound affinity locks are not assigned more than once.

peter-lawrey · peter-lawrey · commit 3e7aef998ef2 · 2012-03-02T12:42:04.000Z
diff --git a/src/main/java/vanilla/java/affinity/AffinityLock.java b/src/main/java/vanilla/java/affinity/AffinityLock.java
@@ -238,6 +238,12 @@ else if (al.base)
         this.reserved = reserved;
     }
 
+    /**
+     * Assigning the current thread has a side effect of preventing the lock being used again until it is released.
+     *
+     * @param bind      whether to bind the thread as well
+     * @param wholeCore whether to reserve all the thread in the same core.
+     */
     private void assignCurrentThread(boolean bind, boolean wholeCore) {
         assignedThread = Thread.currentThread();
         if (bind)
@@ -343,4 +349,8 @@ protected void finalize() throws Throwable {
         }
         super.finalize();
     }
+
+    public int cpuId() {
+        return cpuId;
+    }
 }
diff --git a/src/test/java/vanilla/java/affinity/AffinityLockTest.java b/src/test/java/vanilla/java/affinity/AffinityLockTest.java
@@ -22,6 +22,7 @@
 import java.io.IOException;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
 
 /**
  * @author peter.lawrey
@@ -128,4 +129,17 @@ public void assignReleaseThread() throws IOException {
         assertEquals(AffinityLock.BASE_AFFINITY, AffinitySupport.getAffinity());
     }
 
+    @Test
+    public void testIssue21() {
+        AffinityLock al = AffinityLock.acquireLock();
+        AffinityLock alForAnotherThread = al.acquireLock(AffinityStrategies.ANY);
+        AffinityLock alForAnotherThread2 = al.acquireLock(AffinityStrategies.ANY);
+        assertNotSame(alForAnotherThread, alForAnotherThread2);
+        assertNotSame(alForAnotherThread.cpuId(), alForAnotherThread2.cpuId());
+
+        al.release();
+        alForAnotherThread.release();
+        alForAnotherThread2.release();
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -238,6 +238,12 @@ else if (al.base)`
`238`	`238`	`this.reserved = reserved;`
`239`	`239`	`}`
`240`	`240`
	`241`	`+ /**`
	`242`	`+ * Assigning the current thread has a side effect of preventing the lock being used again until it is released.`
	`243`	`+ *`
	`244`	`+ * @param bind whether to bind the thread as well`
	`245`	`+ * @param wholeCore whether to reserve all the thread in the same core.`
	`246`	`+ */`
`241`	`247`	`private void assignCurrentThread(boolean bind, boolean wholeCore) {`
`242`	`248`	`assignedThread = Thread.currentThread();`
`243`	`249`	`if (bind)`
`@@ -343,4 +349,8 @@ protected void finalize() throws Throwable {`
`343`	`349`	`}`
`344`	`350`	`super.finalize();`
`345`	`351`	`}`
	`352`	`+`
	`353`	`+ public int cpuId() {`
	`354`	`+ return cpuId;`
	`355`	`+ }`
`346`	`356`	`}`