Make Windows process management nicer.

Subprocesses now get killed if the Bazel server itself is killed and so do their subprocesses.

Also implemented Subprocess#close() so that we get a little more control over when the native structures are cleaned up.

--
MOS_MIGRATED_REVID=126628000

1 files changed, 12 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/windows/WindowsSubprocess.java b/src/main/java/com/google/devtools/build/lib/windows/WindowsSubprocess.java
index 0a30ab2aa1..df7b11c8fc 100644
--- a/src/main/java/com/google/devtools/build/lib/windows/WindowsSubprocess.java
+++ b/src/main/java/com/google/devtools/build/lib/windows/WindowsSubprocess.java
@@ -40,7 +40,7 @@ public class WindowsSubprocess implements Subprocess {
 
     @Override
     public void write(int b) throws IOException {
-      byte[] buf = new byte[]{b >= 128 ? ((byte) (b - 256)) : ((byte) b)};
+      byte[] buf = new byte[]{ (byte) b };
       write(buf, 0, 1);
     }
 
@@ -66,10 +66,11 @@ public class WindowsSubprocess implements Subprocess {
       if (read(buf, 0, 1) != 1) {
         return -1;
       } else {
-        return buf[0] < 0 ? 256 + buf[0] : buf[0];
+        return buf[0] & 0xff;
       }
     }
 
+    @Override
     public int read(byte b[], int off, int len) throws IOException {
       return readStream(stream, b, off, len);
     }
@@ -122,10 +123,7 @@ public class WindowsSubprocess implements Subprocess {
 
   @Override
   public synchronized void finalize() {
-    if (nativeProcess != -1) {
-      WindowsProcesses.nativeDelete(nativeProcess);
-      nativeProcess = -1;
-    }
+    close();
   }
 
   @Override
@@ -163,6 +161,14 @@ public class WindowsSubprocess implements Subprocess {
   }
 
   @Override
+  public synchronized void close() {
+    if (nativeProcess != -1) {
+      WindowsProcesses.nativeDelete(nativeProcess);
+      nativeProcess = -1;
+    }
+  }
+
+  @Override
   public OutputStream getOutputStream() {
     return outputStream;
   }