X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=include%2Futils.ml;h=7d3690a599c2d2a057957ac1f9fc6aee510c4282;hb=3791216bfb2b9d966718f83fd414e8bcd5f7a066;hp=88a1dd264d5e9476e209320fa7c81bc536aece82;hpb=468560acb04b8936936080e81152d926c251df30;p=SXSI%2Fxpathcomp.git diff --git a/include/utils.ml b/include/utils.ml index 88a1dd2..7d3690a 100644 --- 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; - Printf.eprintf " %fms\n%!" t ; - Printf.eprintf "Mem use before: %s\n%!" s1; - Printf.eprintf "Final Mem: %s\n\n\n%!" s2; + 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; r ;; @@ -105,16 +105,19 @@ let stop_perf () = let time f ?(count=1) ?(msg="") x = let rec loop i = Gc.compact(); - let t1 = Unix.gettimeofday () in - let r = f x in - let t2 = Unix.gettimeofday () in - let t = (1000. *. (t2 -. t1)) in - Printf.eprintf "%s: " msg; - if (count != 1) then Printf.eprintf "run %i/%i, " i count; - Printf.eprintf "%fms\n%!" t; - if i >= count then (l:= t::!l;r) - else loop (i+1) - in loop 1 + let t1 = Unix.gettimeofday () in + 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" t; + 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;;