Implemented frame timeouts.

Author: dgant

src/main/java/bwapi/BWClient.java

@@ -47,6 +47,7 @@ public void startGame(boolean autoContinue) {
     public void startGame(BWClientConfiguration configuration) {
         configuration.validate();
         botWrapper = new BotWrapper(configuration, eventListener);
+
         Client client = new Client(configuration);
         client.reconnect();
 

src/main/java/bwapi/BWClientConfiguration.java

@@ -29,10 +29,10 @@ public class BWClientConfiguration {
     public boolean async = false;
 
     /**
-     * If JBWAPI detects that this much time (in milliseconds) has passed since a bot's event handlers began, returns control back to BWAPI.
+     * If JBWAPI detects that this much time (in nanoseconds) has passed since a bot's event handlers began, returns control back to BWAPI.
      * Real-time human play typically uses the "fastest" game speed, which has 42.86ms (42,860ns) between frames.
      */
-    public int asyncFrameDurationMillis = 40;
+    public int asyncFrameDurationNanos = 40000;
 
     /**
      * The maximum number of frames to buffer while waiting on a bot.
@@ -53,8 +53,8 @@ public class BWClientConfiguration {
      * Checks that the configuration is in a valid state. Throws an IllegalArgumentException if it isn't.
      */
     public void validate() {
-        if (async && asyncFrameDurationMillis < 0) {
-            throw new IllegalArgumentException("asyncFrameDurationMillis needs to be a non-negative number (it's how long JBWAPI waits for a bot response before returning control to BWAPI).");
+        if (async && asyncFrameDurationNanos < 0) {
+            throw new IllegalArgumentException("asyncFrameDurationNanos needs to be a non-negative number (it's how long JBWAPI waits for a bot response before returning control to BWAPI).");
         }
         if (async && asyncFrameBufferSize < 1) {
             throw new IllegalArgumentException("asyncFrameBufferSize needs to be a positive number (There needs to be at least one frame buffer).");

src/main/java/bwapi/BotWrapper.java

@@ -69,6 +69,8 @@ Game getGame() {
      */
     void onFrame() {
         if (configuration.async) {
+            long startNanos = System.nanoTime();
+            long endNanos = startNanos + configuration.asyncFrameDurationNanos;
             if (botThread == null) {
                 System.out.println("Creating bot thread");
                 botThread = createBotThread();
@@ -78,7 +80,16 @@ void onFrame() {
             frameBuffer.enqueueFrame();
             frameBuffer.lockSize.lock();
             try {
-                while ( ! frameBuffer.empty()) frameBuffer.conditionSize.awaitUninterruptibly();
+                while (frameBuffer.empty()) {
+                    if (configuration.asyncWaitOnFrameZero && liveClientData.gameData().getFrameCount() == 0) {
+                        frameBuffer.conditionSize.await();
+                    } else {
+                        long remainingNanos = endNanos - System.nanoTime();
+                        if (remainingNanos <= 0) break;
+                        frameBuffer.conditionSize.awaitNanos(remainingNanos);
+                    }
+                }
+            } catch(InterruptedException ignored) {
             } finally {
                 frameBuffer.lockSize.unlock();
             }