better output handling

diff --git a/helm/software/components/binaries/matitaprover/matitaprover.ml b/helm/software/components/binaries/matitaprover/matitaprover.ml
index fbbd0e2b795c79a6dd61d8e7c534dc19ebe3316c..776d0adbb6f252b5708e03957edac11cdc091c6e 100644 (file)
--- a/helm/software/components/binaries/matitaprover/matitaprover.ml
+++ b/helm/software/components/binaries/matitaprover/matitaprover.ml
@@ -92,15 +92,20 @@ let success_msg bag l (pp : ?margin:int -> leaf Terms.unit_clause -> string) =
 ;;
 
 let start_msg passives g_passives (pp : leaf Terms.unit_clause -> string) =
-        prerr_endline (string_of_int (Unix.getpid ()));
-(*
-  prerr_endline "Facts";
+  let prefix = string_of_int (Unix.getpid ()) in
+  let prerr_endline s = prerr_endline (prefix ^ ": " ^ s) in
+  prerr_endline "Facts:";
   List.iter (fun x -> prerr_endline (" " ^ pp x)) passives;
-  prerr_endline "Goal";
-  prerr_endline (" " ^ pp g_passives)
-*)
+  prerr_endline "Goal:";
+  prerr_endline (" " ^ pp g_passives);
+  prerr_endline "Order:";
+  prerr_endline " ...fixme...";
+  prerr_endline "Strategy:";
+  prerr_endline " ...fixme...";
 ;;
 
+let report_error s =  prerr_endline (string_of_int (Unix.getpid())^": "^s);;
+
 module Main(C:LeafComparer) = struct
  let main goal hypotheses =
    let module B = MakeBlob(C) in
@@ -116,11 +121,36 @@ module Main(C:LeafComparer) = struct
      P.paramod 
       ~max_steps:max_int bag ~g_passives:[g_passives] ~passives 
    with
-   | [] -> ()
-   | (bag,_,l)::_ -> success_msg bag l Pp.pp_unit_clause
+   | P.Error s -> report_error s; 3
+   | P.Unsatisfiable ((bag,_,l)::_) -> 
+         success_msg bag l Pp.pp_unit_clause; 0
+   | P.Unsatisfiable ([]) -> 
+         report_error "Unsatisfiable but no solution output"; 3
+   | P.GaveUp -> 2
+   | P.Timeout _ -> 1
  ;;
 end
 
+let print_status p = 
+  let print_endline s = prerr_endline (string_of_int p ^ ": " ^ s) in
+    function
+    | Unix.WEXITED 0 -> 
+        print_endline ("status Unsatisfiable for " ^ 
+          Filename.basename !problem_file);
+    | Unix.WEXITED 1 -> 
+        print_endline ("status Timeout for " ^ 
+          Filename.basename !problem_file);
+    | Unix.WEXITED 2 -> 
+        print_endline ("status GaveUp for " ^ 
+          Filename.basename !problem_file);
+    | Unix.WEXITED 3 ->
+        print_endline ("status Error for " ^ 
+          Filename.basename !problem_file);
+    | Unix.WEXITED _ -> assert false
+    | Unix.WSIGNALED s -> print_endline ("killed by signal " ^ string_of_int s)
+    | Unix.WSTOPPED _ -> print_endline "stopped"
+ ;;
+
 let killall l = 
   List.iter (fun pid -> try Unix.kill pid 9 with _ -> ()) l
 ;;
@@ -160,7 +190,7 @@ usage: matitaprover [options] problemfile";
     List.map 
       (fun f -> 
          let pid = Unix.fork () in 
-         if pid = 0 then (f ();exit 0) else pid)
+         if pid = 0 then (exit (f ())) else pid)
     [ 
       (fun () ->     
         let module M = Main(struct let cmp (a,_) (b,_) = compare a b end) in
@@ -170,9 +200,19 @@ usage: matitaprover [options] problemfile";
         let module M = Main(struct let cmp (a,_) (b,_) = compare b a end) in
         M.main goal hypotheses)
     ];
-  let _ = Unix.wait () in
-  killall !childs;
-  exit 0;
+  let rec aux () =
+    if List.length !childs = 0 then
+      (fail_msg (); exit 1)
+    else 
+     match Unix.wait () with
+     | p, (Unix.WEXITED 0 as s) -> 
+         print_status p s;            
+         killall !childs; exit 0;
+     | p, s -> 
+         print_status p s;            
+         childs := List.filter ((<>)p) !childs; aux ()
+  in
+   aux ()
 ;;
 
 main ()