Merge remote-tracking branch 'origin/develop' into async

Author: dgant

pom.xml

@@ -10,7 +10,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jmh.version>1.23</jmh.version>
+        <jmh.version>1.26</jmh.version>
     </properties>
 
     <build>
@@ -49,17 +49,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.9.0</version>
+                <version>3.9.1</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.1</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.0</version>
+                <version>2.22.2</version>
                 <configuration>
 <!--                    <parallel>all</parallel> &lt;!&ndash; Run tests in parallel&ndash;&gt;-->
 <!--                    <useUnlimitedThreads>true</useUnlimitedThreads>-->
@@ -113,37 +113,37 @@
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna</artifactId>
-            <version>5.5.0</version>
+            <version>5.6.0</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/net.java.dev.jna/jna-platform -->
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna-platform</artifactId>
-            <version>5.5.0</version>
+            <version>5.6.0</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/junit/junit -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.3.3</version>
+            <version>3.5.15</version>
             <scope>test</scope>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.assertj/assertj-core -->
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.16.1</version>
+            <version>3.17.2</version>
             <scope>test</scope>
         </dependency>
 

src/main/java/bwapi/UnsafeTools.java

@@ -3,23 +3,39 @@
 import sun.misc.Unsafe;
 
 import java.lang.reflect.Field;
+import java.nio.Buffer;
 
 class UnsafeTools {
-    private static Unsafe unsafe;
 
-    static {
-        try {
-            final Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
-            theUnsafe.setAccessible(true);
-            unsafe = (Unsafe) theUnsafe.get(null);
+    private static Object getOrCrash(final Class<?> className, final Object object, final String fieldName) {
+        try { // get
+            final Field field = className.getDeclaredField(fieldName);
+            final boolean accessible = field.isAccessible();
+            if (!accessible) {
+                field.setAccessible(true);
+            }
+            final Object result = field.get(object);
+            if (!accessible) {
+                field.setAccessible(false);
+            }
+            return result;
 
-        } catch (final Exception e) {
+        } catch (final Exception e) { // or crash...
             e.printStackTrace();
             System.exit(-1);
+            return null;
         }
     }
 
     static Unsafe getUnsafe() {
-        return unsafe;
+        return (Unsafe) getOrCrash(Unsafe.class, null, "theUnsafe");
+    }
+
+    /**
+     * Alternative to `((DirectBuffer) buffer).address())`
+     * (ab)using reflection
+     */
+    static long getAddress(final Buffer buffer) {
+        return (long) getOrCrash(Buffer.class, buffer, "address");
     }
 }

src/main/java/bwapi/WrappedBuffer.java

@@ -1,6 +1,5 @@
 package bwapi;
 
-import com.sun.jna.Memory;
 import com.sun.jna.Pointer;
 import sun.misc.Unsafe;
 
@@ -16,7 +15,8 @@ class WrappedBuffer {
     private static final Unsafe unsafe = UnsafeTools.getUnsafe();
 
     WrappedBuffer(final int size) {
-        this(new Memory(size), size);
+        buffer = ByteBuffer.allocateDirect(size);
+        address = UnsafeTools.getAddress(buffer);
     }
 
     WrappedBuffer(final Pointer pointer, final int size) {
@@ -77,6 +77,7 @@ void putString(final int offset, final int maxLen, final String string) {
         unsafe.putByte(pos, (byte) 0);
     }
 
+
     ByteBuffer getBuffer() {
         return buffer;
     }

src/test/java/bwapi/UnsafeToolsTest.java

@@ -0,0 +1,31 @@
+package bwapi;
+
+import org.junit.Test;
+import sun.misc.Unsafe;
+
+import java.nio.ByteBuffer;
+
+import static org.junit.Assert.*;
+
+public class UnsafeToolsTest {
+
+    @Test
+    public void testGettingUnsafe() {
+        assertNotNull(UnsafeTools.getUnsafe());
+    }
+
+    @Test
+    public void testDirectByteBuffer() {
+        byte[] bytes = {112, 117, 114, 112, 108, 101, 119, 97, 118, 101};
+        final ByteBuffer buffer = ByteBuffer.allocateDirect(bytes.length);
+        buffer.put(bytes);
+
+        long address = UnsafeTools.getAddress(buffer);
+        assertNotEquals(0, address);
+
+        Unsafe unsafe = UnsafeTools.getUnsafe(); //to obtain memory values via the address
+        for (int i=0; i < bytes.length; i++) {
+            assertEquals(bytes[i], unsafe.getByte(address + i));
+        }
+    }
+}