projects
/
SXSI
/
xpathcomp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'handle-stdout'
[SXSI/xpathcomp.git]
/
src
/
utils.ml
diff --git
a/src/utils.ml
b/src/utils.ml
index
0efe748
..
7e3bb4b
100644
(file)
--- a/
src/utils.ml
+++ b/
src/utils.ml
@@
-82,15
+82,16
@@
module Timing =
om, nm))
(infinity, 0., 0., 0, h, h) l
in
om, nm))
(infinity, 0., 0., 0, h, h) l
in
- Logger.verbose fmt "@[%s%s: @[<v 0>[" sub msg;
+ Logger.start_msg fmt "[Stats] ";
+ Logger.msg fmt "%s %s:@\n @[<v 0>[" sub msg;
begin
if len <= 1 then
begin
if len <= 1 then
- Logger.
verbose
fmt
+ Logger.
msg
fmt
"@\n\
"@\n\
-| Time
:
%fms@\n"
+| Time
:
%fms@\n"
tmin
else
tmin
else
- Logger.
verbose
fmt
+ Logger.
msg
fmt
"@\n\
| Number of runs: %i@\n\
| Average time: %fms@\n\
"@\n\
| Number of runs: %i@\n\
| Average time: %fms@\n\
@@
-102,11
+103,12
@@
module Timing =
tmax
end;
tmax
end;
- Logger.
verbose
fmt
+ Logger.
msg
fmt
"| Memory before: %a@\n\
"| Memory before: %a@\n\
-| Memory after: %a@\n]@]
@]@\n@?
"
+| Memory after: %a@\n]@]"
System.pr_mem_status memo
System.pr_mem_status memo
- System.pr_mem_status memn
+ System.pr_mem_status memn;
+ Logger.end_msg fmt "\n\n"
let time f ?(count=1) ?(msg="") x =
let time f ?(count=1) ?(msg="") x =
@@
-137,7
+139,7
@@
let time f ?(count=1) ?(msg="") x =
Queue.clear _t_queue;
List.iter (fun msg' ->
let sub =
Queue.clear _t_queue;
List.iter (fun msg' ->
let sub =
- if msg' <> msg then "
> " else "=
"
+ if msg' <> msg then "
+" else "=
"
in
display_result Format.err_formatter msg' sub (get_timing msg')) pr_stack;
end;
in
display_result Format.err_formatter msg' sub (get_timing msg')) pr_stack;
end;