commit a48faff89c7f8c4dce909bd0caf393700209c04e
author Orion Hodson <oth@google.com> Tue Nov 03 21:10:44 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 03 21:10:44 2020 +0000
tree b75d389f23adf50dbbd62de334a7777e1733b177
parent 203a53e53deeede73882cc5b1ca93c79a4f8c005
parent 4ad7f448f91b45063d4f1387f00af58e36a7aac1

Vogar: stop busy waiting on tasks to time out am: 4ad7f448f9

Original change: https://android-review.googlesource.com/c/platform/external/vogar/+/1486097

Change-Id: Ife85613be9211ebb1eec435e09bfe5cead3d5236

src/vogar/commands/Command.java

diff --git a/src/vogar/commands/Command.java b/src/vogar/commands/Command.java
index dbd4daf..60c30b7 100644
--- a/src/vogar/commands/Command.java
+++ b/src/vogar/commands/Command.java
@@ -308,7 +308,7 @@
      */
     private abstract class TimeoutTask implements Runnable {
         public final void schedule() {
-            timer.schedule(this, System.nanoTime() - timeoutNanoTime, TimeUnit.NANOSECONDS);
+            timer.schedule(this, timeoutNanoTime - System.nanoTime(), TimeUnit.NANOSECONDS);
         }
 
         protected abstract void onTimeout(Process process);
@@ -324,7 +324,7 @@
                 onTimeout(process);
             } else {
                 // if the kill time has been pushed back, reschedule
-                timer.schedule(this, System.nanoTime() - timeoutNanoTime, TimeUnit.NANOSECONDS);
+                schedule();
             }
         }
     }