From 1ad1553a227b555308b754908da5736ba525c426 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Fri, 4 Apr 2008 17:43:00 +0000 Subject: [PATCH] added to the cache a boolean to state if the object is already checked or not (a frozen list is really needed) --- .../components/ng_kernel/nCicEnvironment.ml | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/helm/software/components/ng_kernel/nCicEnvironment.ml b/helm/software/components/ng_kernel/nCicEnvironment.ml index 298b80f19..c78508238 100644 --- a/helm/software/components/ng_kernel/nCicEnvironment.ml +++ b/helm/software/components/ng_kernel/nCicEnvironment.ml @@ -1,33 +1,38 @@ let cache = NUri.UriHash.create 313;; let get_checked_obj u = - try NUri.UriHash.find cache u + try let b, o = NUri.UriHash.find cache u in + if not b then assert false else o with Not_found -> let ouri = NUri.ouri_of_nuri u in let o,_ = CicEnvironment.get_cooked_obj ~trust:false CicUniv.oblivion_ugraph ouri in (* FIX: add all objects to the environment and give back the last one *) - let no = HExtlib.list_last (OCic2NCic.convert_obj ouri o) in - NUri.UriHash.add cache u no; - no + let l = OCic2NCic.convert_obj ouri o in + List.iter (fun (u,_,_,_,_ as o) -> + prerr_endline ("+"^NUri.string_of_uri u); + NUri.UriHash.add cache u (false,o)) l; + HExtlib.list_last l ;; let get_obj u = - try true, NUri.UriHash.find cache u + try NUri.UriHash.find cache u with Not_found -> (* in th final implementation should get it from disk *) let ouri = NUri.ouri_of_nuri u in let o,_ = CicEnvironment.get_cooked_obj ~trust:true CicUniv.oblivion_ugraph ouri in - (* here we should freeze it *) - false, HExtlib.list_last (OCic2NCic.convert_obj ouri o) + let l = OCic2NCic.convert_obj ouri o in + List.iter (fun (u,_,_,_,_ as o) -> + prerr_endline ("+"^NUri.string_of_uri u); + NUri.UriHash.add cache u (false,o)) l; + false, HExtlib.list_last l ;; let add_obj (u,_,_,_,_ as o) = - (* we should unfreeze it *) - NUri.UriHash.add cache u o + NUri.UriHash.replace cache u (true, o) ;; let get_checked_def = function -- 2.39.2