Move AffinitySupport.setThreadId() to Affinity.

peter-lawrey · peter-lawrey · commit eeb3d020447f · 2015-09-01T18:41:52.000+01:00
diff --git a/affinity/src/main/java/net/openhft/affinity/Affinity.java b/affinity/src/main/java/net/openhft/affinity/Affinity.java
@@ -23,6 +23,7 @@
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.lang.reflect.Field;
 import java.util.BitSet;
 
 /**
@@ -32,9 +33,9 @@
  */
 public enum Affinity {
     ;
+    static final Logger LOGGER = LoggerFactory.getLogger(Affinity.class);
     @NotNull
     private static final IAffinity AFFINITY_IMPL;
-    static final Logger LOGGER = LoggerFactory.getLogger(Affinity.class);
     private static Boolean JNAAvailable;
 
     static {
@@ -152,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();
     }
@@ -170,6 +171,19 @@ public static int getThreadId() {
         return AFFINITY_IMPL.getThreadId();
     }
 
+    public static void setThreadId() {
+        try {
+            int threadId = Affinity.getThreadId();
+            final Field tid = Thread.class.getDeclaredField("tid");
+            tid.setAccessible(true);
+            final Thread thread = Thread.currentThread();
+            tid.setLong(thread, threadId);
+            Affinity.LOGGER.info("Set {} to thread id {}", thread.getName(), threadId);
+        } catch (Exception e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
     public static boolean isJNAAvailable() {
         if (JNAAvailable == null)
             try {
diff --git a/affinity/src/main/java/net/openhft/affinity/AffinitySupport.java b/affinity/src/main/java/net/openhft/affinity/AffinitySupport.java
@@ -16,8 +16,6 @@
 
 package net.openhft.affinity;
 
-import java.lang.reflect.Field;
-
 /**
  * For backward compatibility with Affinity 2.x
  */
@@ -28,16 +26,7 @@ public static int getThreadId() {
         return Affinity.getThreadId();
     }
     public static void setThreadId() {
-        try {
-            int threadId = Affinity.getThreadId();
-            final Field tid = Thread.class.getDeclaredField("tid");
-            tid.setAccessible(true);
-            final Thread thread = Thread.currentThread();
-            tid.setLong(thread, threadId);
-            Affinity.LOGGER.info("Set {} to thread id {}", thread.getName(), threadId);
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
+        Affinity.setThreadId();
     }
 
 }
