Merge branch 'master' into pretty-print

[SXSI/xpathcomp.git] / include / utils.ml

diff --git a/include/utils.ml b/include/utils.ml
index e61ee19..2d66352 100644 (file)
--- a/include/utils.ml
+++ b/include/utils.ml
@@ -107,14 +107,15 @@ let time f ?(count=1) ?(msg="") x =
   else
   let rec loop i =
     Gc.compact();
-    let oldstack = read_procmem () in
+    let oldstack = Utils.System.get_status "VmStk" in
     let t1 = Unix.gettimeofday () in
     let r = f x in
     let t2 = Unix.gettimeofday () in
+    let newstack = Utils.System.get_status "VmStk" in
     let t = (1000. *. (t2 -. t1)) in
     Logger.verbose Format.err_formatter "%s: " msg;
     if (count != 1) then Logger.verbose Format.err_formatter "run %i/%i,  "  i count;
-    Logger.verbose Format.err_formatter "%fms (stack size: before=%s, after=%s)@\n" t oldstack (read_procmem());
+    Logger.verbose Format.err_formatter "%fms (stack size: before=%s, after=%s)@\n" t oldstack newstack;
     if i >= count then  (l:= t::!l;r)
     else loop (i+1)
   in