From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 22 Sep 2015 13:18:15 +0000 (+0200)
Subject: [tesh] exec the killer process after fork to make it work on windows
X-Git-Tag: v3_12~130
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/59a223efb7bf8ddf95af4850d0ba77488c03bf13?hp=279fe61f2435e1a9b20e8b307c1a11220f7a88d7

[tesh] exec the killer process after fork to make it work on windows

fork() is only emulated on windows, using a thread of the current
process. So if we don't exec away the killer process, the tesh process
will not end before the timeout, leading to loooooong testing phases.

This script is still in a rather sorry state, more cleanups would be
welcome.
---

diff --git a/tools/tesh/tesh.pl b/tools/tesh/tesh.pl
index 74e6f0c1c4..48f5d1c782 100755
--- a/tools/tesh/tesh.pl
+++ b/tools/tesh/tesh.pl
@@ -45,6 +45,7 @@ use Term::ANSIColor;
 use Text::ParseWords;
 use IPC::Open3;
 use IO::File;
+use English;
 
 ## 
 ## Portability bits for windows
@@ -68,6 +69,21 @@ BEGIN {
 ## Command line option handling
 ##
 
+if ($ARGV[0] eq "--internal-killer-process") {
+    # We fork+exec a waiter process in charge of killing the command after timeout
+    # If the command stops earlier, that's fine: the killer sends a signal to an already stopped process, fails, and quits. 
+    #    Nobody cares about the killer issues. 
+    #    The only problem could arise if another process is given the same PID than cmd. We bet it won't happen :)
+    my $time_to_wait = $ARGV[1];
+    my $pid = $ARGV[2];
+    sleep $time_to_wait;
+    kill('TERM', $pid);
+    sleep 1;
+    kill('KILL', $pid);
+    exit $time_to_wait;
+}
+
+
 sub var_subst {
     my ($text, $name, $value) = @_;
     if ($value) {
@@ -280,22 +296,10 @@ sub exec_cmd {
     $timeout=-1;
     die "fork() failed: $!" unless defined $forked;
     if ( $forked == 0 ) { # child
-      sleep $time_to_wait;
-#      if (RUNNING_ON_WINDOWS) {
-#	  system("TASKKILL /F /T /PID $cmd{'pid'}"); 
-#          # /F: Forcefully
-#	  # /T: Tree kill
-#	  # /PID: poor soul
-#      } else {
-	  kill('TERM', $cmd{'pid'});
-	  sleep 1;
-	  kill('KILL', $cmd{'pid'});
-#      }
-      exit $time_to_wait;
+	exec("$PROGRAM_NAME --internal-killer-process $time_to_wait $cmd{'pid'}");
     }
   }
 
-
   # Cleanup the executing child, and kill the timeouter brother on need
   $cmd{'return'} = 0 unless defined($cmd{'return'});
   if($cmd{'background'} != 1){