X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=src%2Futils.ml;h=8cab636c13c5b9738641792730983e2c9e761d89;hb=046839a3969319f5d38e8f72fe9cb640a639af6c;hp=4ea44cb854fd0d4b11ff528ced4df05e2be0e5e7;hpb=13a15353a161600575ff4b70eda2c7a0f024d969;p=SXSI%2Fxpathcomp.git

diff --git a/src/utils.ml b/src/utils.ml
index 4ea44cb..8cab636 100644
--- a/src/utils.ml
+++ b/src/utils.ml
@@ -48,14 +48,14 @@ struct
     Format.fprintf fmt "[";
     List.iter (fun k ->
       let v = Hashtbl.find h k in
-      Format.fprintf fmt "%s= %s " k v
+      Format.fprintf fmt "%s: %s " k v
     ) [ "VmStk"; "VmRSS"; "VmPeak" ];
     Format.fprintf fmt "]"
 
 end
-(*
+
 let time f ?(count=1) ?(msg="") x =
-  if not !Options.verbose then f x
+  if not !Config.verbose then f x
   else
   let rec loop i =
     Gc.compact();
@@ -65,15 +65,16 @@ let time f ?(count=1) ?(msg="") x =
     let t2 = Unix.gettimeofday () in
     let newmem = System.status () in
     let t = (1000. *. (t2 -. t1)) in
-    Logger.verbose Format.err_formatter "%s: " msg;
+    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 (before: %a, after: %a)@\n" t System.pr_mem_status oldmem System.pr_mem_status newmem;
+    begin
+      Format.pp_open_vbox Format.err_formatter (2 + String.length msg);
+      Logger.verbose
+        Format.err_formatter
+        "@\n| Time: %fms@\n| Memory before: %a@\n| Memory after:  %a@\n]@]@]@\n" t System.pr_mem_status oldmem System.pr_mem_status newmem;
+    end;
     if i >= count then r
     else loop (i+1)
   in
   loop 1
-  
 ;;
-*)