The global db is now updated during decompilation.

[helm.git] / helm / software / components / ng_kernel / nCicLibrary.ml

diff --git a/helm/software/components/ng_kernel/nCicLibrary.ml b/helm/software/components/ng_kernel/nCicLibrary.ml
index cc13dde6e306959c18ba48d0a64f4a992c1e7012..a36b70bf4a6404b6b1302eb182076b95fa71c4ea 100644 (file)
--- a/helm/software/components/ng_kernel/nCicLibrary.ml
+++ b/helm/software/components/ng_kernel/nCicLibrary.ml
@@ -13,31 +13,22 @@
 
 exception LibraryOutOfSync of string Lazy.t
 
-type timestamp =
- (NUri.uri * NCic.obj) list *
- (NUri.uri * string * NReference.reference) list *
- NCic.obj NUri.UriMap.t;;
-
-let time0 = [],[],NUri.UriMap.empty;;
-let storage = ref [];;
-let aliases = ref [];;
-let cache = ref NUri.UriMap.empty;;
-
-let time_travel (sto,ali,cac) = storage := sto; aliases := ali; cache := cac;;
+let magic = 0;;
 
-let path_of_baseuri baseuri =
+let path_of_baseuri ?(no_suffix=false) baseuri =
  let uri = NUri.string_of_uri baseuri in
  let path = String.sub uri 4 (String.length uri - 4) in
  let path = Helm_registry.get "matita.basedir" ^ path in
  let dirname = Filename.dirname path in
   HExtlib.mkdir dirname;
-  path ^ ".ng"
+  if no_suffix then
+   path
+  else
+   path ^ ".ng"
 ;;
 
-let magic = 0;;
-
-let require0 ~baseuri =
- let ch = open_in (path_of_baseuri baseuri) in
+let require_path path =
+ let ch = open_in path in
  let mmagic,dump = Marshal.from_channel ch in
   close_in ch;
   if mmagic <> magic then
@@ -46,9 +37,56 @@ let require0 ~baseuri =
    dump
 ;;
 
+let require0 ~baseuri = require_path (path_of_baseuri baseuri);;
+
+let db_path () = Helm_registry.get "matita.basedir" ^ "/ng_db.ng";;
+
+type timestamp =
+ (NUri.uri * NCic.obj) list *
+ (NUri.uri * string * NReference.reference) list *
+ NCic.obj NUri.UriMap.t;;
+
+let time0 = [],[],NUri.UriMap.empty;;
+let storage = ref [];;
+let local_aliases = ref [];;
+let set_global_aliases,get_global_aliases =
+ let global_aliases = ref [] in
+  let store_db () =
+   let ch = open_out (db_path ()) in
+   Marshal.to_channel ch (magic,!global_aliases) [];
+   close_out ch;
+  in
+  (fun ga -> global_aliases := ga; store_db ()),
+  (fun () -> !global_aliases)
+;;
+
+let init () =
+ try
+  set_global_aliases (require_path (db_path ()))
+ with
+  Sys_error _ -> ()
+;;
+
+let cache = ref NUri.UriMap.empty;;
+
+class status =
+ object
+  val timestamp = (time0 : timestamp)
+  method timestamp = timestamp
+  method set_timestamp v = {< timestamp = v >}
+  method set_library_status
+   : 'status. < timestamp : timestamp; .. > as 'status -> 'self
+   = fun o -> {< timestamp = o#timestamp >}
+ end
+
+let time_travel status =
+ let sto,ali,cac = status#timestamp in
+  storage := sto; local_aliases := ali; cache := cac
+;;
+
 let serialize ~baseuri dump =
  let ch = open_out (path_of_baseuri baseuri) in
- Marshal.to_channel ch (magic,dump) [Marshal.Closures];
+ Marshal.to_channel ch (magic,dump) [];
  close_out ch;
  List.iter
   (fun (uri,obj) ->
@@ -56,7 +94,8 @@ let serialize ~baseuri dump =
     Marshal.to_channel ch (magic,obj) [];
     close_out ch
   ) !storage;
- time_travel time0
+ set_global_aliases (!local_aliases @ get_global_aliases ());
+ time_travel (new status)
 ;;
 
 let refresh_uri uri = NUri.uri_of_string (NUri.string_of_uri uri);;
@@ -114,10 +153,32 @@ module Serializer(S: sig type status end) =
 end
 
 let decompile ~baseuri =
- Unix.unlink (path_of_baseuri baseuri)
- (* WE ARE NOT REMOVING ALL THE OBJECTS YET! *)
+ HExtlib.safe_remove (path_of_baseuri baseuri);
+ let basepath = path_of_baseuri ~no_suffix:true baseuri in
+ try
+  let od = Unix.opendir basepath in
+  let rec aux names =
+   try
+    let name = Unix.readdir od in
+     if name <> "." && name <> ".." then aux (name::names) else aux names
+   with
+    End_of_file -> names in
+  let names = List.map (fun name -> basepath ^ "/" ^ name) (aux []) in
+   Unix.closedir od;
+   List.iter Unix.unlink names;
+   HExtlib.rmdir_descend basepath;
+   set_global_aliases
+    (List.filter
+     (fun (_,_,NReference.Ref (nuri,_)) ->
+       Filename.dirname (NUri.string_of_uri nuri) <> NUri.string_of_uri baseuri
+     ) (get_global_aliases ()))
+ with
+  Unix.Unix_error _ -> () (* raised by Unix.opendir, we hope :-) *)
 ;;
 
+LibraryClean.set_decompile_cb
+ (fun ~baseuri -> decompile ~baseuri:(NUri.uri_of_string baseuri));;
+
 let fetch_obj uri =
  let obj = require0 ~baseuri:uri in
   refresh_uri_in_obj obj
@@ -126,7 +187,8 @@ let fetch_obj uri =
 let resolve name =
  try
   HExtlib.filter_map
-   (fun (_,name',nref) -> if name'=name then Some nref else None) !aliases
+   (fun (_,name',nref) -> if name'=name then Some nref else None)
+   (!local_aliases @ get_global_aliases ())
  with
   Not_found -> raise (NCicEnvironment.ObjectNotFound (lazy name))
 ;;
@@ -134,12 +196,13 @@ let resolve name =
 let aliases_of uri =
  try
   HExtlib.filter_map
-   (fun (uri',_,nref) -> if NUri.eq uri' uri then Some nref else None) !aliases
+   (fun (uri',_,nref) ->
+     if NUri.eq uri' uri then Some nref else None) !local_aliases
  with
   Not_found -> raise (NCicEnvironment.ObjectNotFound (lazy (NUri.string_of_uri uri)))
 ;;
 
-let add_obj u obj =
+let add_obj status u obj =
  storage := (u,obj)::!storage;
   let _,height,_,_,obj = obj in
   let references =
@@ -169,8 +232,8 @@ let add_obj u obj =
               (NReference.Ind (inductive,i,leftno))]
          ) il)
   in
-  aliases := references @ !aliases;
-  !storage,!aliases,!cache
+  local_aliases := references @ !local_aliases;
+  status#set_timestamp (!storage,!local_aliases,!cache)
 ;;
 
 let get_obj u =