Using more native way to kill the whole process tree on Windows. Stop plugin-container crashes

Author: barancev

java/client/src/org/openqa/selenium/os/Kernel32.java

@@ -39,6 +39,7 @@ public interface Kernel32 extends com.sun.jna.platform.win32.Kernel32 {
   boolean AssignProcessToJobObject(HANDLE hJob, HANDLE hProcess);
   boolean TerminateJobObject(HANDLE hJob, long uExitCode);
   int ResumeThread(HANDLE hThread);
+  int GetProcessId(HANDLE Process);
 
   // 0x00000800
   int JOB_OBJECT_LIMIT_BREAKAWAY_OK = 2048;

java/client/src/org/openqa/selenium/os/ProcessUtils.java

@@ -27,6 +27,11 @@
 import java.util.logging.Logger;
 
 import static org.openqa.selenium.Platform.WINDOWS;
+import static org.openqa.selenium.os.WindowsUtils.killPID;
+import static org.openqa.selenium.os.WindowsUtils.thisIsWindows;
+
+import com.sun.jna.Pointer;
+import com.sun.jna.platform.win32.WinNT;
 
 public class ProcessUtils {
   static Logger log = Logger.getLogger(ProcessUtils.class.getName());
@@ -70,6 +75,14 @@ private static int waitForProcessDeath(Process p, long timeout) {
    * @return The exit value of the process.
    */
   public static int killProcess(Process process) {
+    if (thisIsWindows()) {
+      return killWinProcess(process);
+    } else {
+      return killUnixProcess(process);
+    }
+  }
+
+  private static int killUnixProcess(Process process) {
     int exitValue;
 
     // first, wait a second to see if the process will die on it's own (we will likely have asked
@@ -108,6 +121,31 @@ public static int killProcess(Process process) {
     return exitValue;
   }
 
+  private static int killWinProcess(Process process) {
+    int exitValue;
+
+    try {
+      Field f = process.getClass().getDeclaredField("handle");
+      f.setAccessible(true);
+      long hndl = f.getLong(process);
+
+      Kernel32 kernel = Kernel32.INSTANCE;
+      WinNT.HANDLE handle = new WinNT.HANDLE();
+      handle.setPointer(Pointer.createConstant(hndl));
+      int pid = kernel.GetProcessId(handle);
+
+      killPID("" + pid);
+      exitValue = waitForProcessDeath(process, 10000);
+    } catch (Throwable ex) {
+      log.warning("Process refused to die after 10 seconds, and couldn't killall it");
+      ex.printStackTrace();
+      throw new RuntimeException(
+          "Process refused to die after 10 seconds, and couldn't killall it: " + ex.getMessage(),
+          ex);
+    }
+    return exitValue;
+  }
+
   private static class ProcessWaiter implements Runnable {
 
     private volatile InterruptedException t;

java/client/src/org/openqa/selenium/os/UnixProcess.java

@@ -20,6 +20,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.collect.ImmutableMap.copyOf;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.openqa.selenium.os.WindowsUtils.thisIsWindows;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Maps;
@@ -111,10 +112,13 @@ private OutputStream getOutputStream() {
   public int destroy() {
     SeleniumWatchDog watchdog = executeWatchdog;
     watchdog.waitForProcessStarted();
-    watchdog.destroyProcess();
-    watchdog.waitForTerminationAfterDestroy(2, SECONDS);
-    if (!isRunning()) {
-      return getExitCode();
+
+    if (!thisIsWindows()) {
+      watchdog.destroyProcess();
+      watchdog.waitForTerminationAfterDestroy(2, SECONDS);
+      if (!isRunning()) {
+        return getExitCode();
+      }
     }
 
     watchdog.destroyHarder();
@@ -124,7 +128,7 @@ public int destroy() {
     }
 
     log.severe(String.format("Unable to kill process with PID %s",
-        watchdog.getPID()));
+                             watchdog.getPID()));
     int exitCode = -1;
     executor.setExitValue(exitCode);
     return exitCode;

java/client/src/org/openqa/selenium/os/WindowsUtils.java

@@ -168,7 +168,7 @@ public static void kill(String[] cmdarray) throws Exception {
   /**
    * Kills the specified process ID
    */
-  private static void killPID(String processID) {
+  public static void killPID(String processID) {
     executeCommand("taskkill", "/f", "/t", "/pid", processID);
   }