commit 10e7f3ea27022df91860966d9f881aa47949d1ee
author Googler <noreply@google.com> Fri Aug 17 00:31:57 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Fri Aug 17 00:33:11 2018 -0700
tree 6637959293a5b1ac2dc459437651285373fd00c5
parent 2421c5f7de8d3aaa66049c78944a4ac3bf3367ab

Make the action completion watchdog wait instead of waiting for the first
possible action completion to reduce contention. This isn't very pretty, but I
think should be good enough.

RELNOTES: None.
PiperOrigin-RevId: 209111759

src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionInactivityWatchdog.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionInactivityWatchdog.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionInactivityWatchdog.java
index 94e12fb..35446dc 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionInactivityWatchdog.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionInactivityWatchdog.java
@@ -45,7 +45,7 @@
      *
      * @return the number of actions completed during the wait
      */
-    int waitForNextCompletion(int timeoutMilliseconds) throws InterruptedException;
+    int waitForNextCompletion(int timeoutSeconds) throws InterruptedException;
   }
 
   /** An object that the watchdog can report inactivity to. */
@@ -145,7 +145,7 @@
         // Wait a while for any SkyFunction to finish. The returned number indicates how many
         // actions completed during the wait. It's possible that this is more than 1, since
         // this thread may not immediately regain control.
-        int completedActions = monitor.waitForNextCompletion(waitTime.next() * 1000);
+        int completedActions = monitor.waitForNextCompletion(waitTime.next());
         if (!isRunning.get()) {
           break;
         }