Change the logging infrastructure:

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

diff --git a/src/options.ml b/src/options.ml
index 70d702d..03d24a9 100644 (file)
--- a/src/options.ml
+++ b/src/options.ml
@@ -17,10 +17,7 @@ let no_jump = ref false
 let verbose = ref false
 let text_index_type = ref 0
 let do_perf = ref false
-
-(* Only valid if compiled with -DTRACE *)
-let trace_file = ref "trace.dot"
-
+let twopass = ref false
 
 let set_index_type = function
   | "default" -> text_index_type := 0
@@ -38,31 +35,34 @@ let anon_fun =
     | 2 -> output_file := Some s; incr pos
     | _ -> raise (Arg.Bad(s))
 
-let set_tracer 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 Tracer.is_tracer tr then Tracer.activate tr l
+         if Logger.is_logger tr then Logger.activate tr l
          else raise (Arg.Bad (t))
       | _ -> raise (Arg.Bad (t))
   ) (String.explode s ',')
 
-let pretty_tracers () =
+let pretty_loggers () =
   ignore(flush_str_formatter());
   Pretty.print_list
     ~sep:", "
     (fun f s -> fprintf f "%s" s)
     str_formatter
-    (Tracer.available ());
+    (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]";
 
@@ -88,11 +88,9 @@ let spec = Arg.align
     "-v", Arg.Set(verbose), " verbose mode"; ] @
 IFNDEF NTRACE
 THEN [
-    "-trace-file", Arg.Set_string(trace_file),
-    "<trace_file> save the full trace in dot format in <trace_file>";
-    "-trace", Arg.String (set_tracer),
-    "<tracer1:l1,...,tracern:ln> enable tracing with the specified level. Valid tracers are: "
-      ^ (pretty_tracers ())
+    "-log", Arg.String (set_logger),
+    "<logger1:l1,...,loggern:ln> enable logging with the specified level. Valid loggers are: "
+      ^ (pretty_loggers ())
      ]
 ELSE []
 END