X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2FmatitacLib.ml;h=80f99ed0de685508e0c50411fff6b0de64f0e173;hb=0e9753cbccef485911e2c2de1b4cdcae592906b9;hp=91d3a81f1d6e2115f93a76c9c65db40274c458d8;hpb=aa665248454b1dcaf8cfe622dc1a159602119708;p=helm.git

diff --git a/helm/software/matita/matitacLib.ml b/helm/software/matita/matitacLib.ml
index 91d3a81f1..80f99ed0d 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
@@ -107,12 +109,28 @@ let get_include_paths options =
     include_paths
 ;;
 
+let activate_extraction baseuri fname =
+ if false then
+  let mangled_baseuri =
+   let baseuri = String.sub baseuri 5 (String.length baseuri - 5) in
+     let baseuri = Pcre.replace ~pat:"/" ~templ:"_" baseuri in
+      String.uncapitalize baseuri in
+  let f =
+    open_out
+     (Filename.dirname fname ^ "/" ^ mangled_baseuri ^ ".ml") in
+   LibrarySync.set_object_declaration_hook
+    (fun _ obj ->
+      output_string f (CicExportation.ppobj baseuri obj);
+      flush f);
+;;
+
 let compile options fname =
   let matita_debug = Helm_registry.get_bool "matita.debug" in
   let include_paths = get_include_paths options in
   let root,baseuri,fname,_tgt = 
     Librarian.baseuri_of_script ~include_paths fname in
   if Http_getter_storage.is_read_only baseuri then assert false;
+  activate_extraction baseuri fname ;
   let grafite_status = GrafiteSync.init baseuri in
   let lexicon_status = 
     CicNotation2.load_notation ~include_paths:[]
@@ -120,6 +138,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 +216,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 +237,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 +256,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
 ;;
 
@@ -287,6 +308,14 @@ module F =
 
     let load_deps_file = Librarian.load_deps_file;;
 
+    let dotdothack s = 
+      let rec aux = function
+        | ".." :: _ :: tl -> aux tl
+        | x -> x
+      in
+      String.concat "/" (aux (Str.split (Str.regexp "/") s))
+    ;;
+
   end 
 
 module Make = Librarian.Make(F)