Support resetting the affinity of a thread

peter-lawrey · peter-lawrey · commit b5b236747104 · 2016-03-09T17:20:03.000Z
diff --git a/affinity/src/main/java/net/openhft/affinity/Affinity.java b/affinity/src/main/java/net/openhft/affinity/Affinity.java
@@ -153,16 +153,16 @@ public static BitSet getAffinity() {
         return AFFINITY_IMPL.getAffinity();
     }
 
-    public static void setAffinity(final BitSet affinity) {
-        AFFINITY_IMPL.setAffinity(affinity);
-    }
-
     public static void setAffinity(int cpu) {
         BitSet affinity = new BitSet(Runtime.getRuntime().availableProcessors());
         affinity.set(cpu);
         setAffinity(affinity);
     }
 
+    public static void setAffinity(final BitSet affinity) {
+        AFFINITY_IMPL.setAffinity(affinity);
+    }
+
     public static int getCpu() {
         return AFFINITY_IMPL.getCpu();
     }
@@ -215,4 +215,8 @@ private static boolean isNonForkingAffinityAvailable() {
         BootClassPath bootClassPath = BootClassPath.INSTANCE;
         return bootClassPath.has("java.lang.ThreadTrackingGroup") && bootClassPath.has("java.lang.ThreadLifecycleListener");
     }
+
+    public static void resetToBaseAffinity() {
+        Affinity.setAffinity(AffinityLock.BASE_AFFINITY);
+    }
 }
diff --git a/affinity/src/main/java/net/openhft/affinity/AffinityLock.java b/affinity/src/main/java/net/openhft/affinity/AffinityLock.java
@@ -185,10 +185,6 @@ public static String dumpLocks() {
         return LOCK_INVENTORY.dumpLocks();
     }
 
-    public static void main(String[] args) {
-        System.out.println("Test");
-    }
-
     private static boolean areAssertionsEnabled() {
         boolean debug = false;
         assert debug = true;
diff --git a/affinity/src/main/java/net/openhft/affinity/LockInventory.java b/affinity/src/main/java/net/openhft/affinity/LockInventory.java
@@ -161,7 +161,7 @@ public final synchronized void release() {
                 al.boundHere = null;
             }
         }
-        Affinity.setAffinity(AffinityLock.BASE_AFFINITY);
+        Affinity.resetToBaseAffinity();
     }
 
     public final synchronized String dumpLocks() {

Original file line number	Diff line number	Diff line change
`@@ -153,16 +153,16 @@ public static BitSet getAffinity() {`
`153`	`153`	`return AFFINITY_IMPL.getAffinity();`
`154`	`154`	`}`
`155`	`155`
`156`		`- public static void setAffinity(final BitSet affinity) {`
`157`		`- AFFINITY_IMPL.setAffinity(affinity);`
`158`		`- }`
`159`		`-`
`160`	`156`	`public static void setAffinity(int cpu) {`
`161`	`157`	`BitSet affinity = new BitSet(Runtime.getRuntime().availableProcessors());`
`162`	`158`	`affinity.set(cpu);`
`163`	`159`	`setAffinity(affinity);`
`164`	`160`	`}`
`165`	`161`
	`162`	`+ public static void setAffinity(final BitSet affinity) {`
	`163`	`+ AFFINITY_IMPL.setAffinity(affinity);`
	`164`	`+ }`
	`165`	`+`
`166`	`166`	`public static int getCpu() {`
`167`	`167`	`return AFFINITY_IMPL.getCpu();`
`168`	`168`	`}`
`@@ -215,4 +215,8 @@ private static boolean isNonForkingAffinityAvailable() {`
`215`	`215`	`BootClassPath bootClassPath = BootClassPath.INSTANCE;`
`216`	`216`	`return bootClassPath.has("java.lang.ThreadTrackingGroup") && bootClassPath.has("java.lang.ThreadLifecycleListener");`
`217`	`217`	`}`
	`218`	`+`
	`219`	`+ public static void resetToBaseAffinity() {`
	`220`	`+ Affinity.setAffinity(AffinityLock.BASE_AFFINITY);`
	`221`	`+ }`
`218`	`222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ public final synchronized void release() {`
`161`	`161`	`al.boundHere = null;`
`162`	`162`	`}`
`163`	`163`	`}`
`164`		`- Affinity.setAffinity(AffinityLock.BASE_AFFINITY);`
	`164`	`+ Affinity.resetToBaseAffinity();`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`public final synchronized String dumpLocks() {`