Merged jdk9 fixes into async branch

Author: dgant

.gitignore

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

.travis.yml

@@ -13,6 +13,7 @@ before_script:
   - git clone https://github.com/Bytekeeper/sc-docker.git
   - cp it/sc-docker-support/*.dockerfile sc-docker/docker/dockerfiles
   - pushd sc-docker
+  - pip3 install numpy==1.16.6
   - python3 setup.py bdist_wheel
   - pip3 install dist/scbw*.whl
   - '[ ! -f /tmp/sc-docker/starcraft.zip ] || (cp /tmp/sc-docker/starcraft.zip scbw/local_docker && echo "Using cached starcraft.zip")'

README.md

@@ -38,7 +38,7 @@ Add JBWAPI to your dependencies in `<dependencies></dependencies>`:
 <dependency>
     <groupId>com.github.JavaBWAPI</groupId>
     <artifactId>JBWAPI</artifactId>
-    <version>1.5</version>
+    <version>1.5.1</version>
 </dependency>
 ```
 
@@ -56,7 +56,7 @@ allprojects {
 Add JBWAPI as a dependency:
 ```
 dependencies {
-    implementation 'com.github.JavaBWAPI:JBWAPI:1.5'
+    implementation 'com.github.JavaBWAPI:JBWAPI:1.5.1'
 }
 ```
 

it/bots/SittingDuck/pom.xml

@@ -9,7 +9,7 @@
   <parent>
     <groupId>jbwapi.it</groupId>
     <artifactId>bots</artifactId>
-    <version>1.5</version>
+    <version>1.5.1</version>
   </parent>
 
   <artifactId>SittingDuck</artifactId>

it/bots/jbwapibot/pom.xml

@@ -9,7 +9,7 @@
   <parent>
     <groupId>jbwapi.it</groupId>
     <artifactId>bots</artifactId>
-    <version>1.5</version>
+    <version>1.5.1</version>
   </parent>
 
   <artifactId>MarineHell</artifactId>

it/bots/pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>jbwapi.it</groupId>
   <artifactId>bots</artifactId>
-  <version>1.5</version>
+  <version>1.5.1</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>jbwapi</groupId>
       <artifactId>jbwapi</artifactId>
-      <version>1.5</version>
+      <version>1.5.1</version>
     </dependency>
   </dependencies>
 </project>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>jbwapi</groupId>
     <artifactId>jbwapi</artifactId>
-    <version>1.5</version>
+    <version>1.5.1</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/bwapi/BotWrapper.java

@@ -11,7 +11,7 @@ class BotWrapper {
     private final BWClientConfiguration configuration;
     private final BWEventListener eventListener;
     private final FrameBuffer frameBuffer;
-    private ByteBuffer liveData;
+    private WrappedBuffer liveData;
     private Game botGame;
     private Thread botThread;
     private boolean gameOver;
@@ -30,7 +30,7 @@ class BotWrapper {
     /**
      * Resets the BotWrapper for a new botGame.
      */
-    void startNewGame(ByteBuffer liveData, PerformanceMetrics performanceMetrics) {
+    void startNewGame(WrappedBuffer liveData, PerformanceMetrics performanceMetrics) {
         if (configuration.getAsync()) {
             frameBuffer.initialize(liveData, performanceMetrics);
         }

src/main/java/bwapi/Client.java

@@ -25,14 +25,12 @@ of this software and associated documentation files (the "Software"), to deal
 
 package bwapi;
 
-import bwapi.ClientData.GameData;
 import com.sun.jna.Native;
+import com.sun.jna.Pointer;
 import com.sun.jna.platform.win32.Kernel32;
 import com.sun.jna.win32.W32APIOptions;
 
 import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 
 class Client {
     interface MappingKernel extends Kernel32 {
@@ -48,8 +46,8 @@ interface MappingKernel extends Kernel32 {
     private BWClient bwClient;
     private boolean connected = false;
     private RandomAccessFile pipeObjectHandle = null;
-    private ByteBuffer gameTableFileHandle = null;
-    private ByteBuffer mapFileHandle = null;
+    private WrappedBuffer gameTableFileHandle = null;
+    private WrappedBuffer mapFileHandle = null;
 
     Client(BWClient bwClient) {
         this.bwClient = bwClient;
@@ -58,7 +56,7 @@ interface MappingKernel extends Kernel32 {
     /**
      * For test purposes only
      */
-    Client(ByteBuffer buffer) {
+    Client(final WrappedBuffer buffer) {
         clientData = new ClientData();
         clientData.setBuffer(buffer);
     }
@@ -67,7 +65,7 @@ ClientData liveClientData() {
         return clientData;
     }
 
-    ByteBuffer mapFile() {
+    WrappedBuffer mapFile() {
         return mapFileHandle;
     }
 
@@ -90,11 +88,10 @@ private void disconnect() {
             return;
         }
 
-        if (pipeObjectHandle != null ) {
+        if (pipeObjectHandle != null) {
             try {
                 pipeObjectHandle.close();
-            }
-            catch (Exception e) {
+            } catch (Exception e) {
                 e.printStackTrace();
             }
             pipeObjectHandle = null;
@@ -117,21 +114,19 @@ boolean connect() {
 
         // Expose the BWAPI list of games from shared memory via a ByteBuffer
         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);
-            gameTableFileHandle.order(ByteOrder.LITTLE_ENDIAN);
-        }
-        catch (Exception e) {
+            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.");
             return false;
         }
 
         GameTable gameTable;
         try {
             gameTable = new GameTable(gameTableFileHandle);
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             System.err.println("Unable to map Game table.");
             if (bwClient.getConfiguration().getDebugConnection()) {
                 e.printStackTrace();
@@ -140,11 +135,11 @@ boolean connect() {
         }
 
         int latest = 0;
-        for(int i = 0; i < GameTable.MAX_GAME_INSTANCES; i++) {
+        for (int i = 0; i < GameTable.MAX_GAME_INSTANCES; i++) {
             GameInstance gameInstance = gameTable.gameInstances[i];
             System.out.println(i + " | " + gameInstance.serverProcessID + " | " + (gameInstance.isConnected ? 1 : 0) + " | " + gameInstance.lastKeepAliveTime);
             if (gameInstance.serverProcessID != 0 && !gameInstance.isConnected) {
-                if ( gameTableIndex == -1 || latest == 0 || gameInstance.lastKeepAliveTime < latest ) {
+                if (gameTableIndex == -1 || latest == 0 || gameInstance.lastKeepAliveTime < latest) {
                     latest = gameInstance.lastKeepAliveTime;
                     gameTableIndex = i;
                 }
@@ -163,9 +158,8 @@ boolean connect() {
         final String sharedMemoryName = "Local\\bwapi_shared_memory_" + serverProcID;
         final String communicationPipe = "\\\\.\\pipe\\bwapi_pipe_" + serverProcID;
         try {
-            pipeObjectHandle  = new RandomAccessFile(communicationPipe, "rw");
-        }
-        catch (Exception e) {
+            pipeObjectHandle = new RandomAccessFile(communicationPipe, "rw");
+        } catch (Exception e) {
             System.err.println("Unable to open communications pipe: " + communicationPipe);
             if (bwClient.getConfiguration().getDebugConnection()) {
                 e.printStackTrace();
@@ -177,11 +171,11 @@ boolean connect() {
 
         // Expose the raw game data from shared memory via a ByteBuffer
         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);
-        }
-        catch (Exception e) {
+                    0, 0, ClientData.GameData.SIZE);
+            mapFileHandle = new WrappedBuffer(mapFileView, ClientData.GameData.SIZE);
+        } catch (Exception e) {
             System.err.println("Unable to open shared memory mapping: " + sharedMemoryName);
             if (bwClient.getConfiguration().getDebugConnection()) {
                 e.printStackTrace();
@@ -214,8 +208,7 @@ boolean connect() {
         while (code != 2) {
             try {
                 code = pipeObjectHandle.readByte();
-            }
-            catch (Exception e) {
+            } catch (Exception e) {
                 System.err.println("Unable to read pipe object.");
                 if (bwClient.getConfiguration().getDebugConnection()) {
                     e.printStackTrace();
@@ -279,6 +272,7 @@ void sendFrameReceiveFrame() {
                 break;
             }
         }
+
         metrics.getCommunicationListenToReceive().stopTiming();
         metrics.getCommunicationSendToReceive().stopTiming();
 
@@ -298,8 +292,7 @@ void sendFrameReceiveFrame() {
     private void sleep(final int millis) {
         try {
             Thread.sleep(millis);
-        }
-        catch (Exception ignored) {
+        } catch (Exception ignored) {
         }
     }
 }