Bench : add needed information in csv file

src/bench/bench.ml

@@ -353,7 +353,7 @@ answer output time
   let transpose_sorted = function
     | [] -> []
     | (_,lres)::_ as l ->
-    let lref = List.map (fun r -> r.prob,ref []) lres in
+    let lref = List.map (fun r -> (r.prob,r.task,r.idtask),ref []) lres in
     let l = List.rev l in
     let add (_,lr) res = lr := res :: !lr in
     List.iter (fun (_,lres) -> List.iter2 add lref lres) l;
@@ -380,8 +380,12 @@ answer output time
             r.pr_time
         | InternalFailure _ -> fprintf fmt "InternalFailure, \"\""
 in
-    let print_line fmt (b,l) =
-      fprintf fmt "%a ," print_prob b;
+    let print_line fmt ((b,t,id),l) =
+      (* No printer for task since we want the same name evenif its
+         the same file with different environnement (loaded two times) *)
+      fprintf fmt "%a|%s|%i ," print_prob b
+        (Task.task_goal t).Decl.pr_name.Ident.id_string
+        id;
       Pp.print_list Pp.comma print_cell fmt l in
     Pp.print_list print_newline print_line fmt l
 

src/bench/whybench.ml

@@ -380,18 +380,20 @@ let () =
   let nb_scheduled = ref 0 in
   let nb_done = ref 0 in
   let nb_valid = ref 0 in
+  let nb_failure = ref 0 in
   let callback (_,tool) (_,file,prob) task i res =
     if not !opt_quiet then
-      begin match res with
+      begin begin match res with
         | Scheduler.Scheduled -> incr nb_scheduled
         | Scheduler.Done {Call_provers.pr_answer = ans} -> incr nb_done;
           begin match ans with
             | Call_provers.Valid -> incr nb_valid
             | _     -> () end
-        | _ -> ();
-          Format.printf "%a(%i/%i) valid : %i%!"
-            Pp.Ansi.set_column 0
-            !nb_done !nb_scheduled !nb_valid
+        | Scheduler.InternalFailure _ -> incr nb_done; incr nb_failure
+        | Scheduler.Running _ -> () end;
+        Format.printf "%a(%i/%i) valid : %i failure : %i%!"
+          Pp.Ansi.set_column 0
+          !nb_done !nb_scheduled !nb_valid !nb_failure
       end;
     Debug.dprintf debug "%s.%s %a %i with %s : %a@."
       file prob Pretty.print_pr (task_goal task) i tool
@@ -408,6 +410,6 @@ let () =
 
 (*
 Local Variables:
-compile-command: "unset LANG; make -j -C ../.. bin/whybench.byte"
+compile-command: "unset LANG; make -j -C ../.. bin/why3bench.byte"
 End:
 *)