Merge branch 'handle-stdout'

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

diff --git a/include/utils.ml b/include/utils.ml
index 7d3690a..2d66352 100644 (file)
--- a/include/utils.ml
+++ b/include/utils.ml
@@ -37,7 +37,7 @@ DEFINE BIG_A_SIZE = 8192
 let read_procmem () =
   let pid = Unix.getpid() in
   let cin = open_in (Printf.sprintf "/proc/%i/status" pid) in
-  let pattern = "VmHWM" in
+  let pattern = "VmStk" in
   let matchline s = let l = String.length pattern in
   if (String.length s) < l then false
   else let s' = String.sub s 0 l in
@@ -64,9 +64,9 @@ let time_mem f x =
   let t2 = Unix.gettimeofday () in
   let t = (1000. *. (t2 -. t1)) in
     l:= t::!l;
-    Logger.print Format.err_formatter "  %fms\n%!" t ;
-    Logger.print Format.err_formatter "Mem use before: %s\n%!" s1;
-    Logger.print Format.err_formatter "Final Mem: %s\n\n\n%!" s2;
+    Logger.verbose Format.err_formatter "  %fms@\n%!" t ;
+    Logger.verbose Format.err_formatter "Mem use before: %s@\n%!" s1;
+    Logger.verbose Format.err_formatter "Final Mem: %s@\n@\n@\n%!" s2;
     r
 ;;
 
@@ -103,20 +103,23 @@ let stop_perf () =
   Unix.kill !pid Sys.sigint
 
 let time f ?(count=1) ?(msg="") x =
+  if not !Config.verbose then f x
+  else
   let rec loop i =
     Gc.compact();
+    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.print Format.err_formatter "%s: " msg;
-    if (count != 1) then Logger.print Format.err_formatter "run %i/%i,  "  i count;
-    Logger.print Format.err_formatter "%fms" t;
+    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 newstack;
     if i >= count then  (l:= t::!l;r)
     else loop (i+1)
   in
   let r = loop 1 in
-  Logger.print Format.err_formatter "@\n";
   r
 ;;
 let total_time () =  List.fold_left (+.) 0. !l;;
@@ -131,7 +134,8 @@ let next_power2 v =
     v+1
 
 external vb : bool -> int = "%identity"
-
+let compare_int x y = vb (x > y) - vb (x < y)
+let compare_int_unsafe x y = x - y
 
 
 END (* IFNDEF UTILS__ML__ *)