Changeset 31704

Timestamp:

2017-05-25T19:01:33+12:00 (7 years ago)

Author:

ak19

Message:

Cosmetic changes before bringing the GS3's src code version of SafeProcess up to speed with GLI's version

File:

• main/trunk/gli/src/org/greenstone/gatherer/util/SafeProcess.java (modified) (3 diffs)

main/trunk/gli/src/org/greenstone/gatherer/util/SafeProcess.java

@@ -832 +832 @@
 }
 
-// On linux and mac, p.destroy() suffices to kill processes launched by p as well.
-// On Windows we need to do more work, since otherwise processes launched by p remain around executing until they naturally terminate.
+// On linux, the SafeProcess code handling an Interruption suffices to successfully and cleanly terminate
+// the process and any subprocesses launched by p as well (and not even an extra p.destroy() is needed).
+// On Windows, and Mac too, we need to do more work, since otherwise processes launched by p remain
+// around executing until they naturally terminate.
 // e.g. full-import.pl may be terminated with p.destroy(), but it launches import.pl which is left running until it naturally terminates.
 private static void destroyProcess(Process p, boolean canSkipExtraWorkIfLinux) {
@@ -893 +895 @@
     
     return;
-    }
-    
-    // else we're on windows:
-
-    
+    }    
 }
 
@@ -969 +967 @@
     p.destroy();
     } else { // terminate windows way       
-    SafeProcess.killWinProcessWithID(parent_pid); // get rid of process with current pid        
+    SafeProcess.killWinProcessWithID(parent_pid); // get rid of process with current pid
     }