From: Enrico Tassi <enrico.tassi@inria.fr>
Date: Mon, 14 Jan 2008 09:03:13 +0000 (+0000)
Subject: user time is now printed correctly
X-Git-Tag: make_still_working~5672
X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=9452804e1eedc7f74cff8007e823701c9fd40c0c;p=helm.git

user time is now printed correctly
---

diff --git a/helm/software/matita/matitacLib.ml b/helm/software/matita/matitacLib.ml
index 91d3a81f1..83e833ebe 100644
--- a/helm/software/matita/matitacLib.ml
+++ b/helm/software/matita/matitacLib.ml
@@ -64,10 +64,12 @@ let get_macro_context = function
    | None                       -> assert false
 ;;
    
-let pp_times fname rc big_bang = 
+let pp_times fname rc big_bang big_bang_u big_bang_s = 
   if not (Helm_registry.get_bool "matita.verbose") then
     let { Unix.tms_utime = u ; Unix.tms_stime = s} = Unix.times () in
     let r = Unix.gettimeofday () -. big_bang in
+    let u = u -. big_bang_u in
+    let s = s -. big_bang_s in
     let extra = try Sys.getenv "BENCH_EXTRA_TEXT" with Not_found -> "" in
     let rc,rcascii = 
       if rc then "OK","Ok" else "FAIL","Fail" in
@@ -120,6 +122,9 @@ let compile options fname =
   in
   let initial_lexicon_status = lexicon_status in
   let big_bang = Unix.gettimeofday () in
+  let { Unix.tms_utime = big_bang_u ; Unix.tms_stime = big_bang_s} = 
+    Unix.times () 
+  in
   let time = Unix.time () in
   try
     (* sanity checks *)
@@ -195,7 +200,7 @@ let compile options fname =
     if proof_status <> GrafiteTypes.No_proof then
      (HLog.error
       "there are still incomplete proofs at the end of the script"; 
-     pp_times fname false big_bang;
+     pp_times fname false big_bang big_bang_u big_bang_s;
      LexiconSync.time_travel 
        ~present:lexicon_status ~past:initial_lexicon_status;
      clean_exit baseuri false)
@@ -216,14 +221,14 @@ let compile options fname =
      in
      HLog.message 
        (sprintf "execution of %s completed in %s." fname (hou^min^sec));
-     pp_times fname true big_bang;
+     pp_times fname true big_bang big_bang_u big_bang_s;
      LexiconSync.time_travel 
        ~present:lexicon_status ~past:initial_lexicon_status;
      true)
   with 
   (* all exceptions should be wrapped to allow lexicon-undo (LS.time_travel) *)
   | AttemptToInsertAnAlias lexicon_status -> 
-     pp_times fname false big_bang;
+     pp_times fname false big_bang big_bang_u big_bang_s;
      LexiconSync.time_travel 
        ~present:lexicon_status ~past:initial_lexicon_status;
      clean_exit baseuri false
@@ -235,18 +240,18 @@ let compile options fname =
           HLog.error (sprintf "Parse error at %d-%d: %s" x y err)
       | exn -> HLog.error (snd (MatitaExcPp.to_string exn)));
       LexiconSync.time_travel ~present:lex_stat ~past:initial_lexicon_status;
-      pp_times fname false big_bang;
+      pp_times fname false big_bang big_bang_u big_bang_s;
       clean_exit baseuri false
   | Sys.Break as exn ->
      if matita_debug then raise exn; 
      HLog.error "user break!";
-     pp_times fname false big_bang;
+     pp_times fname false big_bang big_bang_u big_bang_s;
      clean_exit baseuri false
   | exn ->
        if matita_debug then raise exn; 
        HLog.error 
          ("Unwrapped exception, please fix: "^ snd (MatitaExcPp.to_string exn));
-       pp_times fname false big_bang;
+       pp_times fname false big_bang big_bang_u big_bang_s;
        clean_exit baseuri false
 ;;