Completely silences the output unless -v is given.

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

diff --git a/include/utils.ml b/include/utils.ml
index a8c865e..4a844f4 100644 (file)
--- a/include/utils.ml
+++ b/include/utils.ml
@@ -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,6 +103,8 @@ let stop_perf () =
   Unix.kill !pid Sys.sigint
 
 let time f ?(count=1) ?(msg="") x =
+  if not !Options.verbose then f x
+  else
   let rec loop i =
     Gc.compact();
     let oldstack = read_procmem () in
@@ -110,14 +112,13 @@ let time f ?(count=1) ?(msg="") x =
     let r = f x in
     let t2 = Unix.gettimeofday () 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 (stack size: before=%s, after=%s)@\n" t oldstack (read_procmem());
+    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());
     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;;