STM: avoid "kill 9 pid" if we know the slave died

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16838 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 4 insertions, 1 deletions

diff --git a/toplevel/stm.ml b/toplevel/stm.ml
index 8165da5d52..51fa14ea46 100644
--- a/toplevel/stm.ml
+++ b/toplevel/stm.ml
@@ -666,7 +666,6 @@ end = struct (* {{{ *)
       Unix.close s2c_w;
       let s =
         Unix.in_channel_of_descr s2c_r, Unix.out_channel_of_descr c2s_w, pid in
-      at_exit(fun () -> try Unix.kill pid 9 with Unix.Unix_error _ -> ());
       s
 
     let init manage_slave =
@@ -789,6 +788,9 @@ end = struct (* {{{ *)
 
   let rec manage_slave respawn =
     let ic, oc, pid = respawn () in
+    let kill_pid =
+      ref (fun () -> try Unix.kill pid 9 with Unix.Unix_error _ -> ()) in
+    at_exit (fun () -> !kill_pid ());
     let last_task = ref None in
     try
       while true do
@@ -838,6 +840,7 @@ end = struct (* {{{ *)
             (* XXX do something sensible *)
       done
     with Sys_error _ | Invalid_argument _ | End_of_file ->
+      kill_pid := (fun () -> ());
       msg_warning(strbrk "The slave process died badly.");
       (match !last_task with
       | Some task ->