Removed more Windows-specific JNA calls

Author: dgant

src/main/java/bwapi/BWClient.java

@@ -119,12 +119,9 @@ public void startGame(BWClientConfiguration gameConfiguration) {
                 }
             }
             while (liveGameData.isInGame()) {
-                long ticksBefore = Kernel32.INSTANCE.GetTickCount();
-
                 botWrapper.onFrame();
                 performanceMetrics.getFlushSideEffects().time(() -> getGame().sideEffects.flushTo(liveGameData));
                 performanceMetrics.getFrameDurationReceiveToSend().stopTiming();
-                long ticksAfter = Kernel32.INSTANCE.GetTickCount();
 
                 client.sendFrameReceiveFrame();
                 if (!client.isConnected()) {

src/main/java/bwapi/Client.java

@@ -246,12 +246,10 @@ void sendFrameReceiveFrame() {
         }
         metrics.getCommunicationSendToSent().stopTiming();
         metrics.getFrameDurationReceiveToSent().stopTiming();
-        metrics.getFrameDurationReceiveToSentGTC().stopTiming();
         if (bwClient.doTime()) {
             final int eventCount = clientData.gameData().getEventCount();
             metrics.getNumberOfEvents().record(eventCount);
             metrics.getNumberOfEventsTimesDurationReceiveToSent().record(eventCount * metrics.getFrameDurationReceiveToSent().getRunningTotal().getLast());
-            metrics.getNumberOfEventsTimesDurationReceiveToSentGTC().record(eventCount * metrics.getFrameDurationReceiveToSentGTC().getRunningTotal().getLast());
         }
 
         // Listen for BWAPI to indicate that a new frame is ready
@@ -279,13 +277,10 @@ void sendFrameReceiveFrame() {
         if (bwClient.doTime()) {
             metrics.getFrameDurationReceiveToSend().startTiming();
             metrics.getFrameDurationReceiveToSent().startTiming();
-            metrics.getFrameDurationReceiveToSentGTC().startTiming();
         }
         metrics.getFrameDurationReceiveToReceive().stopTiming();
-        metrics.getFrameDurationReceiveToReceiveGTC().stopTiming();
         if (bwClient.doTime()) {
             metrics.getFrameDurationReceiveToReceive().startTiming();
-            metrics.getFrameDurationReceiveToReceiveGTC().startTiming();
         }
     }
 

src/main/java/bwapi/PerformanceMetric.java

@@ -61,7 +61,6 @@ public String toString() {
     private final String name;
     private long timeStarted = 0;
     private int interrupted = 0;
-    private boolean usingGetTickCount = false;
 
     private final RunningTotal runningTotal = new RunningTotal();
     private ArrayList<Threshold> thresholds = new ArrayList<>();
@@ -105,15 +104,6 @@ void timeIf(boolean condition, Runnable runnable) {
         }
     }
 
-    PerformanceMetric useGetTickCount() {
-        usingGetTickCount = true;
-        return this;
-    }
-
-    long getNanoseconds() {
-        return usingGetTickCount ? Kernel32.INSTANCE.GetTickCount() * 1000000L: System.nanoTime();
-    }
-
     /**
      * Manually start timing.
      * The next call to stopTiming() will record the duration in fractional milliseconds.
@@ -122,7 +112,7 @@ void startTiming() {
         if (timeStarted > 0) {
             ++interrupted;
         }
-        timeStarted = getNanoseconds();
+        timeStarted = System.nanoTime();
     }
 
 
@@ -133,7 +123,7 @@ void startTiming() {
     void stopTiming() {
         if (timeStarted <= 0) return;
         // Use nanosecond resolution timer, but record in units of milliseconds.
-        long timeEnded = getNanoseconds();
+        long timeEnded = System.nanoTime();
         long timeDiff = timeEnded - timeStarted;
         timeStarted = 0;
         record(timeDiff / 1000000d);

src/main/java/bwapi/PerformanceMetrics.java

@@ -29,16 +29,6 @@ public PerformanceMetric getFrameDurationReceiveToSent() {
     }
     private PerformanceMetric frameDurationReceiveToSent;
 
-    /**
-     * Duration of a frame cycle originating at
-     * the time when JBWAPI observes a new frame in shared memory.
-     * Uses GetTickCount() instead of System.nanoRime()
-     */
-    public PerformanceMetric getFrameDurationReceiveToSentGTC() {
-        return frameDurationReceiveToSentGTC;
-    }
-    private PerformanceMetric frameDurationReceiveToSentGTC;
-
     /**
      * Duration of a frame cycle originating at
      * the time when JBWAPI observes a new frame in shared memory.
@@ -48,16 +38,6 @@ public PerformanceMetric getFrameDurationReceiveToReceive() {
     }
     private PerformanceMetric frameDurationReceiveToReceive;
 
-    /**
-     * Duration of a frame cycle originating at
-     * the time when JBWAPI observes a new frame in shared memory.
-     * Uses GetTickCount() instead of System.nanoRime()
-     */
-    public PerformanceMetric getFrameDurationReceiveToReceiveGTC() {
-        return frameDurationReceiveToReceiveGTC;
-    }
-    private PerformanceMetric frameDurationReceiveToReceiveGTC;
-
     /**
      * Time spent copying game data from system pipe shared memory to a frame buffer.
      * Applicable only in asynchronous mode.
@@ -188,19 +168,6 @@ public PerformanceMetric getNumberOfEventsTimesDurationReceiveToSent() {
     }
     PerformanceMetric numberOfEventsTimesDurationReceiveToSent;
 
-    /**
-     * The number of events sent by BWAPI each frame,
-     * multiplied by the duration of time spent on that frame (receive-to-sent),
-     * and using GetTickCount() instead of System.nanoTime().
-     * Helps detect use of broken BWAPI 4.4 tournament modules, with respect to:
-     *      * - https://github.com/bwapi/bwapi/issues/860
-     *      * - https://github.com/davechurchill/StarcraftAITournamentManager/issues/42
-     */
-    public PerformanceMetric getNumberOfEventsTimesDurationReceiveToSentGTC() {
-        return numberOfEventsTimesDurationReceiveToSentGTC;
-    }
-    PerformanceMetric numberOfEventsTimesDurationReceiveToSentGTC;
-
     private BWClientConfiguration configuration;
     private ArrayList<PerformanceMetric> performanceMetrics = new ArrayList<>();
 
@@ -216,9 +183,7 @@ public void reset() {
         performanceMetrics.clear();
         frameDurationReceiveToSend = new PerformanceMetric(this, "Frame duration: After receiving 'frame ready' -> before sending 'frame done'", 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 85);
         frameDurationReceiveToSent = new PerformanceMetric(this, "Frame duration: After receiving 'frame ready' -> after sending 'frame done'", 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 85);
-        frameDurationReceiveToSentGTC = new PerformanceMetric(this, "Frame duration: After receiving 'frame ready' -> after sending 'frame done' (Using GetTickCount())", 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 85).useGetTickCount();
         frameDurationReceiveToReceive = new PerformanceMetric(this, "Frame duration: After receiving 'frame ready' -> receiving next 'frame ready'", 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 85);
-        frameDurationReceiveToReceiveGTC = new PerformanceMetric(this, "Frame duration: After receiving 'frame ready' -> receiving next 'frame ready' (Using GetTickCount())", 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 85).useGetTickCount();
         communicationSendToReceive = new PerformanceMetric(this, "BWAPI duration: Before sending 'frame done' -> After receiving 'frame ready'", 1, 3, 5, 10, 15, 20, 30);
         communicationSendToSent = new PerformanceMetric(this, "BWAPI duration: Before sending 'frame done' -> After sending 'frame done'", 1, 3, 5, 10, 15, 20, 30);
         communicationListenToReceive = new PerformanceMetric(this, "BWAPI duration: Before listening for 'frame ready' -> After receiving 'frame ready'", 1, 3, 5, 10, 15, 20, 30);
@@ -233,7 +198,6 @@ public void reset() {
         excessSleep = new PerformanceMetric(this, "Excess duration of client sleep", 1, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 85);
         numberOfEvents = new PerformanceMetric(this, "Number of events received from BWAPI", 1, 2, 3, 4, 5, 6, 8, 10, 15, 20);
         numberOfEventsTimesDurationReceiveToSent = new PerformanceMetric(this, "Number of events received from BWAPI, multiplied by the receive-to-sent duration of that frame", 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 85);
-        numberOfEventsTimesDurationReceiveToSentGTC = new PerformanceMetric(this, "Number of events received from BWAPI, multiplied by the receive-to-sent duration of that frame (Using GetTickCount())", 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 85);
     }
 
     void addMetric(PerformanceMetric performanceMetric) {