projects
/
SXSI
/
xpathcomp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the time function re-entrant.
[SXSI/xpathcomp.git]
/
src
/
main.ml
diff --git
a/src/main.ml
b/src/main.ml
index
af00682
..
909a0b8
100644
(file)
--- a/
src/main.ml
+++ b/
src/main.ml
@@
-22,25
+22,25
@@
let tuned_gc = { default_gc with
let mk_runtime run auto doc arg count print outfile =
fun () ->
if !Config.do_perf then start_perf ();
let mk_runtime run auto doc arg count print outfile =
fun () ->
if !Config.do_perf then start_perf ();
- let r = time ~count:!Config.repeat ~msg:"Execution time" (run auto doc) arg in
+ let r =
Utils.
time ~count:!Config.repeat ~msg:"Execution time" (run auto doc) arg in
if !Config.do_perf then stop_perf ();
Logger.verbose Format.err_formatter "Number of results: %i@\n" (count r);
match outfile with
None -> ()
| Some file ->
if !Config.do_perf then stop_perf ();
Logger.verbose Format.err_formatter "Number of results: %i@\n" (count r);
match outfile with
None -> ()
| Some file ->
- time ~count:1 ~msg:"Serialization time" (print file !Config.no_wrap_results doc) r
+
Utils.
time ~count:1 ~msg:"Serialization time" (print file !Config.no_wrap_results doc) r
;;
let main v query_string output =
Tag.init (Tree.tag_operations v);
if !Config.docstats then Tree.stats v;
let query =
;;
let main v query_string output =
Tag.init (Tree.tag_operations v);
if !Config.docstats then Tree.stats v;
let query =
- time ~msg:"Parsing query" XPath.parse query_string
+
Utils.
time ~msg:"Parsing query" XPath.parse query_string
in
Logger.verbose Format.err_formatter "Parsed query:%a@\n"
XPath.Ast.print query;
let auto, bu_info =
in
Logger.verbose Format.err_formatter "Parsed query:%a@\n"
XPath.Ast.print query;
let auto, bu_info =
- time ~msg:"Compiling query" Compile.compile query
+
Utils.
time ~msg:"Compiling query" Compile.compile query
in
if !Config.verbose then Ata.print Format.err_formatter auto;
Gc.full_major();
in
if !Config.verbose then Ata.print Format.err_formatter auto;
Gc.full_major();
@@
-87,23
+87,23
@@
let _ =
let document =
if Filename.check_suffix !Config.input_file ".srx"
then
let document =
if Filename.check_suffix !Config.input_file ".srx"
then
- time
- ~msg:"Loading file"
+
Utils.
time
+ ~msg:"Loading
Index
file"
(Tree.load
~sample:!Config.sample_factor
~load_text:(not !Config.disable_text_collection))
!Config.input_file
else
let v =
(Tree.load
~sample:!Config.sample_factor
~load_text:(not !Config.disable_text_collection))
!Config.input_file
else
let v =
- time
- ~msg:"
Parsing document
"
+
Utils.
time
+ ~msg:"
Loading XML file
"
(Tree.parse_xml_uri)
!Config.input_file
in
let () =
if !Config.save_file <> ""
then
(Tree.parse_xml_uri)
!Config.input_file
in
let () =
if !Config.save_file <> ""
then
- time
+
Utils.
time
~msg:"Writing file to disk"
(Tree.save v)
!Config.save_file;
~msg:"Writing file to disk"
(Tree.save v)
!Config.save_file;