X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=utils.ml;h=2e02bc50de76931c4c6934d4e36231d616d733f4;hb=cf6d366b25132eea7b0f1966c11d034d748af0fa;hp=658d84e7310f24945e59fe6dcd2bfbee13c08386;hpb=6a7025fee3c050eff58baa536a14d80baf5c1b87;p=SXSI%2Fxpathcomp.git

diff --git a/utils.ml b/utils.ml
index 658d84e..2e02bc5 100644
--- a/utils.ml
+++ b/utils.ml
@@ -70,7 +70,7 @@ let read_procmem () =
 
 let l = ref [] ;;
 let init_timer() = l := [];;
-let time f x =
+let time_mem f x =
   let s1  = read_procmem() in
   let t1 = Unix.gettimeofday () in
   let r = f x in
@@ -80,7 +80,16 @@ let time f x =
     l:= t::!l;
     Printf.eprintf "  %fms\n%!" t ;
     Printf.eprintf "Mem use before: %s\n%!" s1;
-    Printf.eprintf "Mem use after: %s\n\n\n%!" s2;
+    Printf.eprintf "Final Mem: %s\n\n\n%!" s2;
+    r
+;;
+let time f x =
+  let t1 = Unix.gettimeofday () in
+  let r = f x in
+  let t2 = Unix.gettimeofday () in 
+  let t = (1000. *. (t2 -. t1)) in
+    l:= t::!l;
+    Printf.eprintf "  %fms\n%!" t ;
     r
 ;;
 let total_time () =  List.fold_left (+.) 0. !l;;