Change the logging infrastructure:

[SXSI/xpathcomp.git] / src / options.ml

diff --git a/src/options.ml b/src/options.ml
index 10c7633..03d24a9 100644 (file)
--- a/src/options.ml
+++ b/src/options.ml
@@ -1,3 +1,6 @@
+open Utils
+open Format
+
 let index_empty_texts = ref false
 let sample_factor = ref 64
 let disable_text_collection = ref false
@@ -13,10 +16,8 @@ let bottom_up = ref false
 let no_jump = ref false
 let verbose = ref false
 let text_index_type = ref 0
-
-(* Only valid if compiled with -DTRACE *)
-let trace_file = ref "trace.dot"
-
+let do_perf = ref false
+let twopass = ref false
 
 let set_index_type = function
   | "default" -> text_index_type := 0
@@ -26,7 +27,6 @@ let set_index_type = function
 
 let usage_msg = Printf.sprintf "%s [options] <input.{xml|srx}> 'query' [output]" Sys.argv.(0)
 
-
 let pos = ref 0
 let anon_fun =
   fun s -> match !pos with
@@ -35,10 +35,34 @@ let anon_fun =
     | 2 -> output_file := Some s; incr pos
     | _ -> raise (Arg.Bad(s))
 
+let set_logger s =
+  List.iter (fun t ->
+    if t = "" then ()
+    else
+      match String.explode t ':' with
+       [ tr; lvl ] ->
+         let l = try int_of_string lvl with _ -> raise (Arg.Bad (lvl)) in
+         if Logger.is_logger tr then Logger.activate tr l
+         else raise (Arg.Bad (t))
+      | _ -> raise (Arg.Bad (t))
+  ) (String.explode s ',')
+
+let pretty_loggers () =
+  ignore(flush_str_formatter());
+  Pretty.print_list
+    ~sep:", "
+    (fun f s -> fprintf f "%s" s)
+    str_formatter
+    (Logger.available ());
+  flush_str_formatter ()
+
 let spec = Arg.align
   [ "-c", Arg.Set(count_only),
     " counting only (don't materialize the result set)";
 
+    "-two", Arg.Set(twopass),
+    " Use twopass algorithm";
+
     "-f", Arg.Set_int(sample_factor),
     "<n> sample factor [default=64]";
 
@@ -55,15 +79,18 @@ let spec = Arg.align
 
     "-nj", Arg.Set(no_jump), " disable jumping";
 
+    "-p",  Arg.Set(do_perf), " dump perf counters (Linux only)";
+
     "-index-type", Arg.Symbol ([ "default"; "swcsa"; "rlcsa" ],
                               set_index_type),
     " choose text index type";
 
     "-v", Arg.Set(verbose), " verbose mode"; ] @
-IFDEF TRACE
+IFNDEF NTRACE
 THEN [
-    "-trace-file", Arg.Set_string(trace_file),
-    "<trace_file> save the full trace in dot format in <trace_file>"
+    "-log", Arg.String (set_logger),
+    "<logger1:l1,...,loggern:ln> enable logging with the specified level. Valid loggers are: "
+      ^ (pretty_loggers ())
      ]
 ELSE []
 END