remove dependency on directbuffer

Author: JasperGeurtz

src/main/java/bwapi/Client.java

@@ -29,6 +29,7 @@ of this software and associated documentation files (the "Software"), to deal
 import bwapi.ClientData.GameData;
 import bwapi.ClientData.Shape;
 import com.sun.jna.Native;
+import com.sun.jna.Pointer;
 import com.sun.jna.platform.win32.Kernel32;
 import com.sun.jna.win32.W32APIOptions;
 
@@ -57,7 +58,7 @@ public interface EventHandler {
     private ClientData.GameData gameData;
     private boolean connected = false;
     private RandomAccessFile pipeObjectHandle = null;
-    private ByteBuffer mapFileHandle = null;
+    private WrappedBuffer mapFileHandle = null;
     private ByteBuffer gameTableFileHandle = null;
 
     private boolean debugConnection = false;
@@ -69,8 +70,8 @@ public interface EventHandler {
     /**
      * For test purposes only
      */
-    Client(ByteBuffer buffer) {
-        clientData = new ClientData(buffer);
+    Client(final WrappedBuffer memory) {
+        clientData = new ClientData(memory);
         gameData = clientData.new GameData(0);
     }
 
@@ -130,7 +131,6 @@ boolean connect() {
             gameTableFileHandle = Kernel32.INSTANCE.MapViewOfFile(
                     MappingKernel.INSTANCE.OpenFileMapping(READ_WRITE, false, "Local\\bwapi_shared_memory_game_list"), READ_WRITE, 0, 0, GameTable.SIZE)
                     .getByteBuffer(0, GameTable.SIZE);
-            gameTableFileHandle.order(ByteOrder.LITTLE_ENDIAN);
         }
         catch (Exception e) {
             System.err.println("Game table mapping not found.");
@@ -186,9 +186,10 @@ boolean connect() {
         System.out.println("Connected");
 
         try {
-            mapFileHandle = Kernel32.INSTANCE.MapViewOfFile(MappingKernel.INSTANCE
+            final Pointer mapFileView = Kernel32.INSTANCE.MapViewOfFile(MappingKernel.INSTANCE
                             .OpenFileMapping(READ_WRITE, false, sharedMemoryName), READ_WRITE,
-                    0, 0, GameData.SIZE).getByteBuffer(0, GameData.SIZE);
+                    0, 0, GameData.SIZE);
+            mapFileHandle = new WrappedBuffer(mapFileView, GameData.SIZE);
         }
         catch (Exception e) {
             System.err.println("Unable to open shared memory mapping: " + sharedMemoryName);

src/main/java/bwapi/ClientData.java

@@ -1,9 +1,10 @@
 package bwapi;
-import java.nio.ByteBuffer;
+
 final class ClientData {
     final WrappedBuffer buffer;
-    ClientData(final ByteBuffer buffer) {
-        this.buffer = new WrappedBuffer(buffer);
+
+    ClientData(final WrappedBuffer buffer) {
+        this.buffer = buffer;
     }
     class UnitCommand {
         static final int SIZE = 24;

src/main/java/bwapi/WrappedBuffer.java

@@ -1,7 +1,8 @@
 package bwapi;
 
+import com.sun.jna.Memory;
+import com.sun.jna.Pointer;
 import sun.misc.Unsafe;
-import sun.nio.ch.DirectBuffer;
 
 import java.lang.reflect.Field;
 import java.nio.ByteBuffer;
@@ -10,27 +11,33 @@
  * Wrapper around ByteBuffer that makes use of sun.misc.Unsafe if available.
  */
 class WrappedBuffer {
-    private final ByteBuffer buffer;
+    private final Pointer pointer;
+    private final int size;
     private final long address;
-    private final Unsafe unsafe;
 
-    WrappedBuffer(final ByteBuffer byteBuffer) {
-        unsafe = getTheUnsafe();
-        buffer = byteBuffer;
-        address = ((DirectBuffer) buffer).address();
-    }
-
-    private static Unsafe getTheUnsafe() {
+    private static Unsafe unsafe;
+    static {
         try {
             final Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
             theUnsafe.setAccessible(true);
-            return (Unsafe) theUnsafe.get(null);
+            unsafe = (Unsafe) theUnsafe.get(null);
+
         } catch (final Exception e) {
             e.printStackTrace();
-            return null;
+            System.exit(-1);
         }
     }
 
+    WrappedBuffer(final int size) {
+        this(new Memory(size), size);
+    }
+
+    WrappedBuffer(final Pointer pointer, final int size) {
+        this.pointer = pointer;
+        this.size = size;
+        this.address = Pointer.nativeValue(pointer);
+    }
+
     byte getByte(final int offset) {
         return unsafe.getByte(address + offset);
     }
@@ -64,7 +71,7 @@ void putDouble(final int offset, final double value) {
     }
 
     String getString(final int offset, final int maxLen) {
-        char[] buf = new char[maxLen];
+        final char[] buf = new char[maxLen];
         long pos = offset + address;
         for (int i = 0; i < maxLen; i++) {
             byte b = unsafe.getByte(pos);
@@ -88,6 +95,6 @@ void putString(final int offset, final int maxLen, final String string) {
     }
 
     ByteBuffer getBuffer() {
-        return buffer;
+        return pointer.getByteBuffer(0, size);
     }
 }

src/test/java/bwapi/ClientDataBenchmark.java

@@ -3,7 +3,6 @@
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 
-import java.nio.ByteBuffer;
 import java.util.SplittableRandom;
 import java.util.stream.Collectors;
 
@@ -19,7 +18,7 @@ public static class EmptyState {
 
         @Setup(Level.Invocation)
         public void setup() {
-            client = new Client(ByteBuffer.allocateDirect(ClientData.GameData.SIZE));
+            client = new Client(new WrappedBuffer(ClientData.GameData.SIZE));
             game = new Game(client);
             strings = buildStrings();
         }
@@ -34,7 +33,7 @@ public static class FilledWithStrings {
 
         @Setup(Level.Invocation)
         public void setup() {
-            client = new Client(ByteBuffer.allocateDirect(ClientData.GameData.SIZE));
+            client = new Client(new WrappedBuffer(ClientData.GameData.SIZE));
             data = client.gameData();
             game = new Game(client);
             String[] strings = buildStrings();

src/test/java/bwapi/GameBuilder.java

@@ -2,8 +2,6 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.zip.InflaterOutputStream;
@@ -15,20 +13,20 @@ public static Game createGame() throws IOException {
     }
 
     public static Game createGame(String mapName) throws IOException {
-        final ByteBuffer buffer = binToBuffer("src/test/resources/" + mapName + "_frame0_buffer.bin");
+        final WrappedBuffer buffer = binToBuffer("src/test/resources/" + mapName + "_frame0_buffer.bin");
         return createGame(new Client(buffer));
     }
 
-    public static ByteBuffer binToBuffer(String binLocation) throws IOException {
+    public static WrappedBuffer binToBuffer(String binLocation) throws IOException {
         final byte[] compressedBytes = Files.readAllBytes(Paths.get(binLocation));
         final ByteArrayOutputStream out = new ByteArrayOutputStream();
         final InflaterOutputStream zin = new InflaterOutputStream(out);
         zin.write(compressedBytes);
         zin.flush();
         zin.close();
         final byte[] bytes = out.toByteArray();
-        final ByteBuffer buffer = ByteBuffer.allocateDirect(bytes.length);
-        buffer.put(bytes);
+        final WrappedBuffer buffer = new WrappedBuffer(bytes.length);
+        buffer.getBuffer().put(bytes);
         return buffer;
     }
 

src/test/java/bwapi/GameTest.java

@@ -1,14 +1,5 @@
 package bwapi;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNull;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.theories.DataPoints;
@@ -17,6 +8,15 @@
 import org.junit.experimental.theories.Theory;
 import org.junit.runner.RunWith;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertNull;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
 @RunWith(Theories.class)
 public class GameTest {
 
@@ -89,7 +89,7 @@ public void shouldNotFindNonOverlappingUnits(
 
     @Test
     public void ifReplaySelfAndEnemyShouldBeNull() throws IOException {
-        ByteBuffer buffer = GameBuilder.binToBuffer("src/test/resources/" + "(2)Benzene.scx" + "_frame0_buffer.bin");
+        WrappedBuffer buffer = GameBuilder.binToBuffer("src/test/resources/" + "(2)Benzene.scx" + "_frame0_buffer.bin");
 
         Client client = new Client(buffer);
         // modify the buffer to fake a replay

src/test/java/bwapi/WrappedBufferTest.java

@@ -2,12 +2,10 @@
 
 import org.junit.Test;
 
-import java.nio.ByteBuffer;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class WrappedBufferTest {
-    private WrappedBuffer sut = new WrappedBuffer(ByteBuffer.allocateDirect(1024));
+    private final WrappedBuffer sut = new WrappedBuffer(1024);
 
     @Test
     public void shouldGetAndSetStrings() {