New version of deep_subsumption

[helm.git] / components / extlib / hExtlib.ml

diff --git a/components/extlib/hExtlib.ml b/components/extlib/hExtlib.ml
index 4296db49b668acde2ee35efc2aa87e0fe9f2018c..bf725122c260e31f0b8c4595e36f9af2833db2fb 100644 (file)
--- a/components/extlib/hExtlib.ml
+++ b/components/extlib/hExtlib.ml
@@ -29,37 +29,58 @@
 
 let profiling_enabled = ComponentsConf.profiling
 
-let profiling_printings = ref (fun () -> true)
+let something_profiled = ref false
+
+let _ = 
+  if !something_profiled then
+    at_exit 
+      (fun _ -> 
+        prerr_endline 
+         (Printf.sprintf "!! %39s ---------- --------- --------- ---------" 
+           (String.make 39 '-'));
+        prerr_endline 
+         (Printf.sprintf "!! %-39s %10s %9s %9s %9s" 
+           "function" "#calls" "total" "max" "average"))
+
+let profiling_printings = ref (fun _ -> true)
 let set_profiling_printings f = profiling_printings := f
 
 type profiler = { profile : 'a 'b. ('a -> 'b) -> 'a -> 'b }
-let profile ?(enable = true) =
+let profile ?(enable = true) s =
  if profiling_enabled && enable then
-  function s ->
    let total = ref 0.0 in
    let calls = ref 0 in
+   let max = ref 0.0 in
    let profile f x =
     let before = Unix.gettimeofday () in
     try
      incr calls;
      let res = f x in
      let after = Unix.gettimeofday () in
-      total := !total +. (after -. before);
+     let delta = after -. before in
+      total := !total +. delta;
+      if delta > !max then max := delta;
       res
     with
      exc ->
       let after = Unix.gettimeofday () in
-       total := !total +. (after -. before);
+      let delta = after -. before in
+       total := !total +. delta;
+       if delta > !max then max := delta;
        raise exc
    in
    at_exit
     (fun () ->
-      if !profiling_printings () && !total <> 0. then
+      if !profiling_printings s && !calls <> 0 then
+       begin
+        something_profiled := true;
         prerr_endline
-         ("!! TOTAL TIME SPENT IN " ^ s ^ " ("^string_of_int !calls^"): " ^ string_of_float !total));
+         (Printf.sprintf "!! %-39s %10d %9.4f %9.4f %9.4f" 
+         s !calls !total !max (!total /. (float_of_int !calls)))
+       end);
    { profile = profile }
  else
-  function _ -> { profile = fun f x -> f x }
+   { profile = fun f x -> f x }
 
 (** {2 Optional values} *)
 
@@ -344,3 +365,7 @@ let raise_localized_exception ~offset floc exn =
    { flocb with Lexing.pos_cnum = x }, { floce with Lexing.pos_cnum = y }
  in
   raise (Localized (floc, exn))
+
+let estimate_size x = 
+  4 * (String.length (Marshal.to_string x [])) / 1024
+