commit 5d1339dc311dd67338a722c759abad1d8b2961d5
author jmmv <jmmv@google.com> Mon Oct 21 18:08:53 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Oct 21 18:09:53 2019 -0700
tree 175af6af172d746323af59647c109f3f0d71ad99
parent f6bfbdc534a12b77d376e0743548335712da764e

Move logic to wait for a process in a noninterruptible manner to Subprocess.

The Subprocess class already had this functionality in it, but it was hidden
behind the destroyAndWait() method, which did two things. This change pulls
out the actual wait into a separate method and removes some duplication of
this functionality.

RELNOTES: None.
PiperOrigin-RevId: 275966801

src/main/java/com/google/devtools/build/lib/shell/Subprocess.java

diff --git a/src/main/java/com/google/devtools/build/lib/shell/Subprocess.java b/src/main/java/com/google/devtools/build/lib/shell/Subprocess.java
index 8cb0988..d7ce117 100644
--- a/src/main/java/com/google/devtools/build/lib/shell/Subprocess.java
+++ b/src/main/java/com/google/devtools/build/lib/shell/Subprocess.java
@@ -72,13 +72,8 @@
   @Override
   void close();
 
-  /**
-   * Kills the subprocess and awaits for its termination so that we know it has released any
-   * resources it may have held.
-   */
-  default void destroyAndWait() {
-    destroy();
-
+  /** Waits for the process to finish in a non-interruptible manner. */
+  default void waitForUninterruptibly() {
     boolean wasInterrupted = false;
     try {
       while (true) {
@@ -96,4 +91,13 @@
       }
     }
   }
+
+  /**
+   * Kills the subprocess and awaits for its termination so that we know it has released any
+   * resources it may have held.
+   */
+  default void destroyAndWait() {
+    destroy();
+    waitForUninterruptibly();
+  }
 }