Merge pull request #78 from OpenHFT/jna_5_8_0

compatibility with JNA 5.8.0. Fixes #77

Author: JerryShea

affinity/pom.xml

@@ -128,6 +128,7 @@
             </build>
         </profile>
     </profiles>
+
     <build>
         <plugins>
             <plugin>

affinity/src/main/java/net/openhft/affinity/impl/LinuxHelper.java

@@ -158,7 +158,7 @@ public static int syscall(int number, Object... args) {
     }
 
     interface CLibrary extends Library {
-        CLibrary INSTANCE = (CLibrary) Native.loadLibrary(LIBRARY_NAME, CLibrary.class);
+        CLibrary INSTANCE = Native.load(LIBRARY_NAME, CLibrary.class);
 
         int sched_setaffinity(final int pid,
                               final int cpusetsize,

affinity/src/main/java/net/openhft/affinity/impl/OSXJNAAffinity.java

@@ -72,8 +72,7 @@ public int getThreadId() {
     }
 
     interface CLibrary extends Library {
-        CLibrary INSTANCE = (CLibrary)
-                Native.loadLibrary("libpthread.dylib", CLibrary.class);
+        CLibrary INSTANCE = Native.load("libpthread.dylib", CLibrary.class);
 
         int pthread_self() throws LastErrorException;
     }

affinity/src/main/java/net/openhft/affinity/impl/PosixJNAAffinity.java

@@ -191,8 +191,7 @@ public int getThreadId() {
      * @author BegemoT
      */
     interface CLibrary extends Library {
-        CLibrary INSTANCE = (CLibrary)
-                Native.loadLibrary(LIBRARY_NAME, CLibrary.class);
+        CLibrary INSTANCE = Native.load(LIBRARY_NAME, CLibrary.class);
 
         int sched_setaffinity(final int pid,
                               final int cpusetsize,

affinity/src/main/java/net/openhft/affinity/impl/SolarisJNAAffinity.java

@@ -72,8 +72,7 @@ public int getThreadId() {
     }
 
     interface CLibrary extends Library {
-        CLibrary INSTANCE = (CLibrary)
-                Native.loadLibrary("c", CLibrary.class);
+        CLibrary INSTANCE = Native.load("c", CLibrary.class);
 
         int pthread_self() throws LastErrorException;
     }

affinity/src/main/java/net/openhft/affinity/impl/WindowsJNAAffinity.java

@@ -17,12 +17,10 @@
 
 package net.openhft.affinity.impl;
 
-import com.sun.jna.LastErrorException;
-import com.sun.jna.Library;
-import com.sun.jna.Native;
-import com.sun.jna.PointerType;
+import com.sun.jna.*;
 import com.sun.jna.platform.win32.Kernel32;
 import com.sun.jna.platform.win32.WinDef;
+import com.sun.jna.platform.win32.WinNT;
 import com.sun.jna.ptr.LongByReference;
 import net.openhft.affinity.IAffinity;
 import org.jetbrains.annotations.Nullable;
@@ -86,7 +84,7 @@ public void setAffinity(final BitSet affinity) {
 
         int pid = getTid();
         try {
-            lib.SetThreadAffinityMask(pid, aff);
+            lib.SetThreadAffinityMask(handle(pid), aff);
         } catch (LastErrorException e) {
             throw new IllegalStateException("SetThreadAffinityMask((" + pid + ") , &(" + affinity + ") ) errorNo=" + e.getErrorCode(), e);
         }
@@ -104,7 +102,7 @@ private BitSet getAffinity0() {
         final LongByReference cpuset2 = new LongByReference(0);
         try {
 
-            final int ret = lib.GetProcessAffinityMask(-1, cpuset1, cpuset2);
+            final int ret = lib.GetProcessAffinityMask(handle(-1), cpuset1, cpuset2);
             // Successful result is positive, according to the docs
             // https://msdn.microsoft.com/en-us/library/windows/desktop/ms683213%28v=vs.85%29.aspx
             if (ret <= 0) {
@@ -120,6 +118,10 @@ private BitSet getAffinity0() {
         return null;
     }
 
+    private WinNT.HANDLE handle(int pid) {
+        return new WinNT.HANDLE(new Pointer(pid));
+    }
+
     public int getTid() {
         final CLibrary lib = CLibrary.INSTANCE;
 
@@ -152,11 +154,11 @@ public int getThreadId() {
      * @author BegemoT
      */
     private interface CLibrary extends Library {
-        CLibrary INSTANCE = (CLibrary) Native.loadLibrary("kernel32", CLibrary.class);
+        CLibrary INSTANCE = Native.load("kernel32", CLibrary.class);
 
-        int GetProcessAffinityMask(final int pid, final PointerType lpProcessAffinityMask, final PointerType lpSystemAffinityMask) throws LastErrorException;
+        int GetProcessAffinityMask(final WinNT.HANDLE pid, final PointerType lpProcessAffinityMask, final PointerType lpSystemAffinityMask) throws LastErrorException;
 
-        void SetThreadAffinityMask(final int pid, final WinDef.DWORD lpProcessAffinityMask) throws LastErrorException;
+        void SetThreadAffinityMask(final WinNT.HANDLE pid, final WinDef.DWORD lpProcessAffinityMask) throws LastErrorException;
 
         int GetCurrentThread() throws LastErrorException;
     }

affinity/src/test/java/net/openhft/affinity/impl/NativeAffinityImpTest.java

@@ -17,7 +17,7 @@
 
 package net.openhft.affinity.impl;
 
-import net.openhft.affinity.AffinitySupport;
+import net.openhft.affinity.Affinity;
 import net.openhft.affinity.IAffinity;
 import org.junit.Assume;
 import org.junit.BeforeClass;
@@ -45,7 +45,7 @@ public IAffinity getImpl() {
     public void testGettid() {
         System.out.println("pid=" + getImpl().getProcessId());
         System.out.println("tid=" + getImpl().getThreadId());
-        AffinitySupport.setThreadId();
+        Affinity.setThreadId();
 
         for (int j = 0; j < 3; j++) {
             final int runs = 100000;

affinity/src/test/java/net/openhft/affinity/impl/PosixJNAAffinityTest.java

@@ -18,7 +18,6 @@
 package net.openhft.affinity.impl;
 
 import net.openhft.affinity.Affinity;
-import net.openhft.affinity.AffinitySupport;
 import net.openhft.affinity.IAffinity;
 import org.junit.Assume;
 import org.junit.BeforeClass;
@@ -44,7 +43,7 @@ public IAffinity getImpl() {
     public void testGettid() {
         System.out.println("pid=" + getImpl().getProcessId());
         System.out.println("tid=" + getImpl().getThreadId());
-        AffinitySupport.setThreadId();
+        Affinity.setThreadId();
 
         for (int j = 0; j < 3; j++) {
             final int runs = 100000;

affinity/src/test/java/net/openhft/affinity/impl/VanillaCpuLayoutTest.java

@@ -22,7 +22,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author peter.lawrey