X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2FmatitacLib.ml;h=82a7ca32ef1189ada1ff5cfb2e65629cecdf6b1b;hb=57e4568829db52f1959006041d72036ae9663955;hp=ee09258e07bad2f80fd62af05a1a1810c5e26267;hpb=7f2444c2670cadafddd8785b687ef312158376b0;p=helm.git

diff --git a/matita/matitacLib.ml b/matita/matitacLib.ml
index ee09258e0..82a7ca32e 100644
--- a/matita/matitacLib.ml
+++ b/matita/matitacLib.ml
@@ -48,7 +48,7 @@ let run_script is eval_function  =
   in
   let slash_n_RE = Pcre.regexp "\\n" in
   let cb = 
-    if Helm_registry.get_bool "matita.quiet" then 
+    if Helm_registry.get_int "matita.verbosity" < 1 then 
       (fun _ _ -> ())
     else 
       (fun grafite_status stm ->
@@ -63,6 +63,7 @@ let run_script is eval_function  =
         in
         HLog.debug ("Executing: ``" ^ stm ^ "''"))
   in
+  let matita_debug = Helm_registry.get_bool "matita.debug" in
   try
    let grafite_status'', lexicon_status'' =
     match eval_function lexicon_status' grafite_status' is cb with
@@ -77,13 +78,22 @@ let run_script is eval_function  =
   | End_of_file
   | CicNotationParser.Parse_error _ as exn -> raise exn
   | exn -> 
-      HLog.error (snd (MatitaExcPp.to_string exn));
+      if not matita_debug then
+       HLog.error (snd (MatitaExcPp.to_string exn)) ;
       raise exn
 
 let fname () =
-  match Helm_registry.get_list Helm_registry.string "matita.args" with
+  let rec aux = function
+  | ""::tl -> aux tl
   | [x] -> x
-  | _ -> MatitaInit.die_usage ()
+  | [] -> MatitaInit.die_usage ()
+  | l -> 
+      prerr_endline 
+        ("Wrong commands: " ^ 
+          String.concat " " (List.map (fun x -> "'" ^ x ^ "'") l));
+      MatitaInit.die_usage ()
+  in
+  aux (Helm_registry.get_list Helm_registry.string "matita.args")
 
 let pp_ocaml_mode () = 
   HLog.message "";
@@ -103,8 +113,7 @@ let clean_exit n =
    | Some grafite_status ->
       try
        let baseuri = GrafiteTypes.get_string_option grafite_status "baseuri" in
-       let basedir = Helm_registry.get "matita.basedir" in
-       LibraryClean.clean_baseuris ~basedir ~verbose:false [baseuri];
+       LibraryClean.clean_baseuris ~verbose:false [baseuri];
        opt_exit n
       with GrafiteTypes.Option_error("baseuri", "not found") ->
        (* no baseuri ==> nothing to clean yet *)
@@ -154,10 +163,59 @@ let go () =
   Sys.catch_break true;
   interactive_loop ()
 
+let pp_times fname bench_mode rc big_bang = 
+  if bench_mode then
+    begin
+      let { Unix.tms_utime = u ; Unix.tms_stime = s} = Unix.times () in
+      let r = Unix.gettimeofday () -. big_bang in
+      let extra = try Sys.getenv "BENCH_EXTRA_TEXT" with Not_found -> "" in
+      let cc = 
+        if Str.string_match (Str.regexp ".*opt$") Sys.argv.(0) 0 then 
+          "matitac.opt" 
+        else 
+          "matitac" 
+      in
+      let rc = if rc then "OK" else "FAIL" in
+      let times = 
+        let fmt t = 
+          let seconds = int_of_float t in
+          let cents = int_of_float ((t -. floor t) *. 100.0) in
+          let minutes = seconds / 60 in
+          let seconds = seconds mod 60 in
+          Printf.sprintf "%dm%02d.%02ds" minutes seconds cents
+        in
+        Printf.sprintf "%s %s %s" (fmt r) (fmt u) (fmt s)
+      in
+      let fname = 
+        match MatitamakeLib.development_for_dir (Filename.dirname fname) with
+        | None -> fname
+        | Some d -> 
+            let rootlen = String.length(MatitamakeLib.root_for_development d)in
+            let fnamelen = String.length fname in
+            assert (fnamelen > rootlen); 
+            String.sub fname rootlen (fnamelen - rootlen)           
+      in
+      let fname = 
+        if fname.[0] = '/' then
+          String.sub fname 1 (String.length fname - 1)
+        else
+          fname
+      in
+      let s = Printf.sprintf "%s %-35s %-4s %s %s" cc fname rc times extra in
+      print_endline s;
+      flush stdout
+    end
+;;
+
 let main ~mode = 
+  let big_bang = Unix.gettimeofday () in
   MatitaInit.initialize_all ();
   (* must be called after init since args are set by cmdline parsing *)
   let fname = fname () in
+  let system_mode =  Helm_registry.get_bool "matita.system" in
+  let bench_mode =  Helm_registry.get_bool "matita.bench" in
+  if bench_mode then
+    Helm_registry.set_int "matita.verbosity" 0;
   let include_paths =
    Helm_registry.get_list Helm_registry.string "matita.includes" in
   grafite_status := Some (GrafiteSync.init ());
@@ -166,17 +224,19 @@ let main ~mode =
     BuildTimeConf.core_notation_script);
   Sys.catch_break true;
   let origcb = HLog.get_log_callback () in
+  let origcb t s = origcb t ((if system_mode then "[S] " else "") ^ s) in
   let newcb tag s =
     match tag with
     | `Debug | `Message -> ()
     | `Warning | `Error -> origcb tag s
   in
-  if Helm_registry.get_bool "matita.quiet" then
+  if Helm_registry.get_int "matita.verbosity" < 1 then
     HLog.set_log_callback newcb;
+  if bench_mode then MatitaMisc.shutup ();
   let matita_debug = Helm_registry.get_bool "matita.debug" in
   try
     let time = Unix.time () in
-    if Helm_registry.get_bool "matita.quiet" then
+    if Helm_registry.get_int "matita.verbosity" < 1 && not bench_mode then
       origcb `Message ("compiling " ^ Filename.basename fname ^ "...")
     else
       HLog.message (sprintf "execution of %s started:" fname);
@@ -212,35 +272,48 @@ let main ~mode =
      begin
       HLog.error
        "there are still incomplete proofs at the end of the script";
+      pp_times fname bench_mode true big_bang;
       clean_exit (Some 2)
      end
     else
      begin
-       let basedir = Helm_registry.get "matita.basedir" in
-       let baseuri =
+       let baseuri, _fullpathforfname =
         DependenciesParser.baseuri_of_script ~include_paths fname in
-       let moo_fname = LibraryMisc.obj_file_of_baseuri ~basedir ~baseuri in
-       let lexicon_fname= LibraryMisc.lexicon_file_of_baseuri ~basedir ~baseuri in
+       let moo_fname = 
+         LibraryMisc.obj_file_of_baseuri 
+           ~must_exist:false ~baseuri ~writable:true 
+       in
+       let lexicon_fname= 
+         LibraryMisc.lexicon_file_of_baseuri 
+          ~must_exist:false ~baseuri ~writable:true 
+       in
        let metadata_fname =
-        LibraryMisc.metadata_file_of_baseuri ~basedir ~baseuri
+        LibraryMisc.metadata_file_of_baseuri 
+          ~must_exist:false ~baseuri ~writable:true
        in
        GrafiteMarshal.save_moo moo_fname moo_content_rev;
        LibraryNoDb.save_metadata metadata_fname metadata;
        LexiconMarshal.save_lexicon lexicon_fname lexicon_content_rev;
        HLog.message 
          (sprintf "execution of %s completed in %s." fname (hou^min^sec));
+       pp_times fname bench_mode true big_bang;
        exit 0
      end
   with 
-  | Sys.Break ->
+  | Sys.Break as exn ->
+     if matita_debug then raise exn;
       HLog.error "user break!";
+      pp_times fname bench_mode false big_bang;
       if mode = `COMPILER then
         clean_exit (Some ~-1)
       else
         pp_ocaml_mode ()
   | GrafiteEngine.Drop ->
       if mode = `COMPILER then 
-        clean_exit (Some 1)
+        begin
+          pp_times fname bench_mode false big_bang;
+          clean_exit (Some 1)
+        end
       else 
         pp_ocaml_mode ()
   | GrafiteEngine.Macro (floc,_) ->
@@ -248,20 +321,29 @@ let main ~mode =
       HLog.error
        (sprintf "A macro has been found in a script at %d-%d" x y);
       if mode = `COMPILER then 
-        clean_exit (Some 1)
+        begin
+          pp_times fname bench_mode false big_bang;
+          clean_exit (Some 1)
+        end
       else 
         pp_ocaml_mode ()
   | HExtlib.Localized (floc,CicNotationParser.Parse_error err) ->
      let (x, y) = HExtlib.loc_of_floc floc in
      HLog.error (sprintf "Parse error at %d-%d: %s" x y err);
      if mode = `COMPILER then
-       clean_exit (Some 1)
+       begin
+         pp_times fname bench_mode false big_bang;
+         clean_exit (Some 1)
+       end
      else
        pp_ocaml_mode ()
   | exn ->
       if matita_debug then raise exn;
       if mode = `COMPILER then 
-        clean_exit (Some 3)
+        begin
+          pp_times fname bench_mode false big_bang;
+          clean_exit (Some 3)
+        end
       else 
         pp_ocaml_mode ()