avoid using bytebuffer altogether

Author: JasperGeurtz

.gitignore

@@ -8,3 +8,5 @@ target/
 .classpath
 .project
 
+# logging
+*.log

src/main/java/bwapi/Client.java

@@ -34,8 +34,6 @@ of this software and associated documentation files (the "Software"), to deal
 import com.sun.jna.win32.W32APIOptions;
 
 import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 
 class Client {
     interface MappingKernel extends Kernel32 {
@@ -59,7 +57,7 @@ public interface EventHandler {
     private boolean connected = false;
     private RandomAccessFile pipeObjectHandle = null;
     private WrappedBuffer mapFileHandle = null;
-    private ByteBuffer gameTableFileHandle = null;
+    private WrappedBuffer gameTableFileHandle = null;
 
     private boolean debugConnection = false;
 
@@ -128,9 +126,10 @@ boolean connect() {
         int gameTableIndex = -1;
 
         try {
-            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);
+            final Pointer gameTableView = Kernel32.INSTANCE.MapViewOfFile(MappingKernel.INSTANCE
+                            .OpenFileMapping(READ_WRITE, false, "Local\\bwapi_shared_memory_game_list"), READ_WRITE,
+                    0, 0, GameTable.SIZE);
+            gameTableFileHandle = new WrappedBuffer(gameTableView, GameTable.SIZE);
         }
         catch (Exception e) {
             System.err.println("Game table mapping not found.");
@@ -281,13 +280,8 @@ int addString(final String string) {
             throw new IllegalStateException("Too many strings!");
         }
 
-        //truncate string if its size equals or exceeds 1024
-        final String stringTruncated = string.length() >= MAX_STRING_SIZE
-                ? string.substring(0, MAX_STRING_SIZE - 1)
-                : string;
-
         gameData.setStringCount(stringCount + 1);
-        gameData.setStrings(stringCount, stringTruncated);
+        gameData.setStrings(stringCount, string);
         return stringCount;
     }
 

src/main/java/bwapi/GameTable.java

@@ -1,7 +1,5 @@
 package bwapi;
 
-import java.nio.ByteBuffer;
-
 /**
  * https://github.com/bwapi/bwapi/blob/456ad612abc84da4103162ba0bf8ec4f053a4b1d/bwapi/include/BWAPI/Client/GameTable.h
  */
@@ -29,12 +27,12 @@ class GameTable {
 
     final GameInstance[] gameInstances;
 
-    GameTable(final ByteBuffer gameTableFileHandle) {
+    GameTable(final WrappedBuffer gameTableFileHandle) {
         gameInstances = new GameInstance[MAX_GAME_INSTANCES];
 
         for (int i = 0; i < MAX_GAME_INSTANCES; i++) {
             int serverProcessID = gameTableFileHandle.getInt(GameInstance.SIZE * i);
-            boolean isConnected = gameTableFileHandle.get(GameInstance.SIZE * i + 4) != 0;
+            boolean isConnected = gameTableFileHandle.getByte(GameInstance.SIZE * i + 4) != 0;
             int lastKeepAliveTime = gameTableFileHandle.getInt(GameInstance.SIZE * i + 4 + 4);
             gameInstances[i] = new GameInstance(serverProcessID, isConnected, lastKeepAliveTime);
         }

src/main/java/bwapi/WrappedBuffer.java

@@ -8,11 +8,10 @@
 import java.nio.ByteBuffer;
 
 /**
- * Wrapper around ByteBuffer that makes use of sun.misc.Unsafe if available.
+ * Wrapper around offheap memory that uses sun.misc.Unsafe to for fast access.
  */
 class WrappedBuffer {
-    private final Pointer pointer;
-    private final int size;
+    private final ByteBuffer buffer;
     private final long address;
 
     private static Unsafe unsafe;
@@ -33,8 +32,7 @@ class WrappedBuffer {
     }
 
     WrappedBuffer(final Pointer pointer, final int size) {
-        this.pointer = pointer;
-        this.size = size;
+        this.buffer = pointer.getByteBuffer(0, size);
         this.address = Pointer.nativeValue(pointer);
     }
 
@@ -83,18 +81,15 @@ String getString(final int offset, final int maxLen) {
     }
 
     void putString(final int offset, final int maxLen, final String string) {
-        if (string.length() >= maxLen) {
-            throw new StringIndexOutOfBoundsException();
-        }
         long pos = offset + address;
-        for (int i = 0; i < string.length(); i++) {
+        for (int i = 0; i < Math.min(string.length(), maxLen - 1); i++) {
             unsafe.putByte(pos, (byte) string.charAt(i));
             pos++;
         }
         unsafe.putByte(pos, (byte) 0);
     }
 
     ByteBuffer getBuffer() {
-        return pointer.getByteBuffer(0, size);
+        return buffer;
     }
 }