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
;;
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 = 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.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 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;;