Add process id and thread id

peter-lawrey · peter-lawrey · commit 6156511c7388 · 2013-10-16T11:56:32.000-04:00
diff --git a/affinity/src/main/java/net/openhft/affinity/IAffinity.java b/affinity/src/main/java/net/openhft/affinity/IAffinity.java
@@ -37,4 +37,14 @@ public interface IAffinity {
      * @return the current cpu id, or -1 if unknown.
      */
     int getCpu();
+
+    /**
+     * @return the process id of the current process.
+     */
+    int getProcessId();
+
+    /**
+     * @return the thread id of the current thread or -1 is not available.
+     */
+    int getThreadId();
 }
diff --git a/affinity/src/main/java/net/openhft/affinity/impl/NullAffinity.java b/affinity/src/main/java/net/openhft/affinity/impl/NullAffinity.java
@@ -19,6 +19,7 @@
 
 import net.openhft.affinity.IAffinity;
 
+import java.lang.management.ManagementFactory;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -27,7 +28,6 @@
  */
 public enum NullAffinity implements IAffinity {
     INSTANCE;
-
     private static final Logger LOGGER = Logger.getLogger(NullAffinity.class.getName());
 
     @Override
@@ -46,4 +46,16 @@ public int getCpu() {
         return -1;
     }
 
+    @Override
+    public int getProcessId() {
+        final String name = ManagementFactory.getRuntimeMXBean().getName();
+        return Integer.parseInt(name.split("@")[0]);
+    }
+
+    @Override
+    public int getThreadId() {
+        throw new UnsupportedOperationException();
+    }
+
+
 }
diff --git a/affinity/src/main/java/net/openhft/affinity/impl/PosixJNAAffinity.java b/affinity/src/main/java/net/openhft/affinity/impl/PosixJNAAffinity.java
@@ -82,6 +82,16 @@ public int getCpu() {
         }
     }
 
+    @Override
+    public int getProcessId() {
+        return CLibrary.INSTANCE.getpid();
+    }
+
+    @Override
+    public int getThreadId() {
+        return -1;
+    }
+
 
     /**
      * @author BegemoT
@@ -99,6 +109,8 @@ int sched_getaffinity(final int pid,
                               final PointerType cpuset) throws LastErrorException;
 
         int sched_getcpu() throws LastErrorException;
+
+        int getpid() throws LastErrorException;
     }
 
     static {
diff --git a/affinity/src/main/java/net/openhft/affinity/impl/WindowsJNAAffinity.java b/affinity/src/main/java/net/openhft/affinity/impl/WindowsJNAAffinity.java
@@ -20,6 +20,7 @@
 import com.sun.jna.Library;
 import com.sun.jna.Native;
 import com.sun.jna.PointerType;
+import com.sun.jna.platform.win32.Kernel32;
 import com.sun.jna.platform.win32.WinDef;
 import com.sun.jna.ptr.LongByReference;
 import net.openhft.affinity.IAffinity;
@@ -90,6 +91,16 @@ public int getCpu() {
         return -1;
     }
 
+    @Override
+    public int getProcessId() {
+        return Kernel32.INSTANCE.GetCurrentProcessId();
+    }
+
+    @Override
+    public int getThreadId() {
+        return Kernel32.INSTANCE.GetCurrentThreadId();
+    }
+
 
     /**
      * @author BegemoT
diff --git a/affinity/src/test/java/net/openhft/affinity/AffinityLockTest.java b/affinity/src/test/java/net/openhft/affinity/AffinityLockTest.java
@@ -24,6 +24,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static net.openhft.affinity.AffinityLock.acquireLock;
+import static net.openhft.affinity.AffinityLock.dumpLocks;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
 
@@ -177,4 +179,32 @@ public void testGettid() {
         System.out.println("cpu= " + AffinitySupport.getCpu());
     }
 
+    @Test
+    public void testAffinity() throws InterruptedException {
+        System.out.println("Started");
+        displayStatus();
+        final AffinityLock al = acquireLock();
+        System.out.println("Main locked");
+        displayStatus();
+        Thread t = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                AffinityLock al2 = al.acquireLock(AffinityStrategies.ANY);
+                System.out.println("Thread-0 locked");
+                displayStatus();
+                al2.release();
+            }
+        });
+        t.start();
+        t.join();
+        System.out.println("Thread-0 unlocked");
+        displayStatus();
+        al.release();
+        System.out.println("All unlocked");
+        displayStatus();
+    }
+
+    private void displayStatus() {
+        System.out.println(Thread.currentThread() + " on " + AffinitySupport.getCpu() + "\n" + dumpLocks());
+    }
 }
