X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=inline;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2Fcheck.ml;h=6e2074db0b887120901a5429865567afe84cdc2b;hb=e299c8aad16752ea008cbb8a673996652b548e30;hp=4dd6fcbf40ad825e9465f0009ac3e7925ccdd4b0;hpb=2f9546a7604d7e370f2eef038302c3cccdadf223;p=helm.git

diff --git a/helm/software/components/ng_kernel/check.ml b/helm/software/components/ng_kernel/check.ml
index 4dd6fcbf4..6e2074db0 100644
--- a/helm/software/components/ng_kernel/check.ml
+++ b/helm/software/components/ng_kernel/check.ml
@@ -1,17 +1,15 @@
 let _ =
   let indent = ref 0 in
-  let do_indent () = String.make !indent ' ' in
+(*    let do_indent () = String.make !indent ' ' in  *)
    NCicTypeChecker.set_logger 
     (function 
     | `Start_type_checking s -> ();
-(*        prerr_endline (do_indent () ^ "Start: " ^ NUri.string_of_uri s);
+(*         prerr_endline (do_indent () ^ "Start: " ^ NUri.string_of_uri s); *)
         incr indent
-*)
+
     | `Type_checking_completed s ->  ();
-(*
         decr indent;
-        prerr_endline (do_indent () ^ "End: " ^ NUri.string_of_uri s) 
-*)
+(*         prerr_endline (do_indent () ^ "End: " ^ NUri.string_of_uri s)  *)
        );
   NCicPp.set_ppterm NCicPp.trivial_pp_term;
   Helm_registry.load_from "conf.xml";
@@ -37,14 +35,53 @@ let _ =
   in
   let alluris = 
     HExtlib.filter_map
-      (fun u -> try Some (NUri.nuri_of_ouri (UriManager.uri_of_string u)) with _
-      -> None) alluris 
+      (fun u -> try Some (UriManager.uri_of_string u) with _ -> None) alluris 
   in
+  (* brutal *)
+  prerr_endline "computing graphs to load...";
+  let dbd = HSql.quick_connect (LibraryDb.parse_dbd_conf ()) in
+  MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner");
+  let uniq l = 
+     HExtlib.list_uniq (List.sort UriManager.compare l)
+  in
+  let who_uses u = 
+    uniq (List.map fst (MetadataDeps.inverse_deps ~dbd u))
+  in
+  let roots_alluris = 
+          let rec fix acc l = 
+           let acc, todo = 
+            List.fold_left (fun (acc,todo) x ->
+               let w = who_uses x in
+               if w = [] then (x::acc,todo) else (acc,uniq (todo@w)))
+            (acc,[]) l
+           in
+           if todo = [] then uniq acc else fix acc todo
+          in
+          (fix [] alluris)
+  in
+  prerr_endline "generating Coq graphs...";
+  CicEnvironment.set_trust (fun _ -> false);
+  List.iter (fun u ->
+          prerr_endline (" - " ^ UriManager.string_of_uri u);
+          ignore(CicTypeChecker.typecheck u);
+    ) alluris;
+  prerr_endline "loading...";
+  List.iter 
+    (fun u -> 
+       prerr_endline ("  - "^UriManager.string_of_uri u);
+       try NCicEnvironment.load_graph u with exn -> ())
+    roots_alluris;
+  prerr_endline "finished....";
+  CicUniv.do_rank (NCicEnvironment.get_graph ());
+  prerr_endline "ranked....";
   prerr_endline "caching objects";
+  HExtlib.profiling_enabled := false;
   List.iter (fun uu ->
+     let uu= NUri.nuri_of_ouri uu in
      indent := 0;
 (*     prerr_endline ("************* INIZIO **************** " ^ NUri.string_of_uri uu); *)
     let _,o = NCicEnvironment.get_obj uu in
+(*     prerr_endline (NCicPp.ppobj o);  *)
     try 
       NCicTypeChecker.typecheck_obj o;
 (*       prerr_endline ("************* FINE ****************" ^ NUri.string_of_uri uu); *)
@@ -59,10 +96,12 @@ let _ =
     alluris;
   NCicEnvironment.invalidate ();
   Gc.compact ();
+  HExtlib.profiling_enabled := true;
   prerr_endline "typechecking, first with the new and then with the old kernel";
   let prima = Unix.gettimeofday () in
   List.iter 
     (fun u ->
+       let u= NUri.nuri_of_ouri u in
       indent := 0;
       NCicTypeChecker.typecheck_obj (snd (NCicEnvironment.get_obj u)))
     alluris;
@@ -71,7 +110,6 @@ let _ =
   let dopo2 = Unix.gettimeofday () in
   Printf.eprintf "NEW typing: %3.2f, gc: %3.2f\n%!" (dopo -. prima) (dopo2 -.  dopo);
   CicEnvironment.invalidate ();
-  let alluris = List.map NUri.ouri_of_nuri alluris in
   Gc.compact ();
   let prima = Unix.gettimeofday () in
   List.iter (fun u -> ignore (CicTypeChecker.typecheck u)) alluris;