commit 2a0b94a67d9fbf7b1037db674128427cd2068837
author David Srbecky <dsrbecky@google.com> Sat May 22 02:23:38 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat May 22 02:23:38 2021 +0000
tree 6d5230e1f2bc1154dc7f67e62bb011ac128042d6
parent 630156c4ab77bbf1e403b3f502d9560c9c0aeefb
parent 8626b07900280375a1033ae1091cc9a0e14a8c09

vogar: Increase kill timeouts am: 8626b07900

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

Change-Id: I43182987379ba8e6106d05b1b654fd049830828d

src/vogar/Vogar.java

diff --git a/src/vogar/Vogar.java b/src/vogar/Vogar.java
index a7f3272..1bf8846 100644
--- a/src/vogar/Vogar.java
+++ b/src/vogar/Vogar.java
@@ -40,7 +40,7 @@
  * Command line interface for running benchmarks and tests on dalvik.
  */
 public final class Vogar {
-    static final int LARGE_TIMEOUT_MULTIPLIER = 10;
+    static final int LARGE_TIMEOUT_MULTIPLIER = 20;
     public static final int NUM_PROCESSORS = Runtime.getRuntime().availableProcessors();
 
     private final List<File> actionFiles = new ArrayList<File>();

src/vogar/commands/Command.java

diff --git a/src/vogar/commands/Command.java b/src/vogar/commands/Command.java
index 60c30b7..38fdf24 100644
--- a/src/vogar/commands/Command.java
+++ b/src/vogar/commands/Command.java
@@ -205,8 +205,8 @@
                 log.verbose("sending quit signal to command " + Command.this);
                 sendQuitSignal(process);
 
-                // hard kill in 2 seconds
-                timeoutNanoTime = System.nanoTime() + TimeUnit.SECONDS.toNanos(2);
+                // hard kill in 1 minute
+                timeoutNanoTime = System.nanoTime() + TimeUnit.SECONDS.toNanos(60);
                 new TimeoutTask() {
                     @Override protected void onTimeout(Process process) {
                         log.verbose("killing timed out command " + Command.this);