X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=src%2Ftatoo.ml;h=d8c3e0990a833fc66daacfda9805093e75715430;hp=c3cddfebdf658e39b99b21682cfb3dfe061edd5a;hb=aade6d9ba2e2b65e021de8a1c3a2d3874aa5742e;hpb=af9d790ca62e678e8e70ab8d8fa7f804985a75e0

diff --git a/src/tatoo.ml b/src/tatoo.ml
index c3cddfe..d8c3e09 100644
--- a/src/tatoo.ml
+++ b/src/tatoo.ml
@@ -24,21 +24,73 @@ let time f arg msg =
   r
 
 
+let compose_parallel run auto_list tree nodes () =
+  match auto_list with
+    [ auto ] -> [run auto tree nodes]
+  | _ -> assert false
+
+let compose_sequential run auto_list tree nodes () =
+  [ List.fold_left (fun acc auto ->
+    run auto tree acc) nodes auto_list ]
+
+
+let restart_parallel run auto_list tree nodes () =
+  match auto_list with
+    [ auto ] -> List.map snd (run auto tree nodes)
+  | _ -> assert false
+
+let restart_sequential run auto_list tree nodes () =
+  List.map (fun auto -> run auto tree nodes) auto_list
+
 let main () =
   let () = Options.parse () in
   let doc =
-    let fd = open_in !Options.input_file in
+    let fd, close_fd = match !Options.input_file with
+      None | Some "-" | Some "/dev/stdin" -> stdin, ignore
+    | Some input ->
+        let fd = open_in input in fd, fun () -> close_in fd
+    in
     let d = time Naive_tree.load_xml_file fd "parsing xml document" in
-    close_in fd; d
+    close_fd (); d
   in
-  let query =
+  let queries =
     time
-      Xpath.Parser.parse
-      (Ulexing.from_latin1_string !Options.query)
-      "parsing XPath query"
+      (fun l ->
+        List.map (fun q ->
+          Xpath.Parser.parse
+            (Ulexing.from_utf8_string q)) l)
+      !Options.queries
+      "parsing XPath queries"
   in
-  let auto =
-    time Xpath.Compile.path query "compiling XPath query"
+  (* parallel, compose  ->     action
+     true, true -> Ata.concat of all automata and single run
+     true, false -> Ata.merge of all automata and single run
+     false, true -> Eval first, then run on results then ...
+     false, false -> Eval first on root, then second on root then ...
+  *)
+  let auto_list =
+    time
+      (fun l ->
+        List.map (fun query -> Xpath.Compile.path query) l)
+      queries
+      "compiling XPath queries"
+  in
+  let auto_list =
+    if !Options.parallel then
+      match auto_list with
+        fst :: rest ->
+          let f =
+            if !Options.compose then
+              Ata.concat
+            else
+              Ata.merge
+          in
+          let big_auto = List.fold_left f fst rest in
+          [big_auto]
+      | _ -> assert false
+
+    else
+      auto_list
   in
   let output =
     match !Options.output_file with
@@ -46,29 +98,49 @@ let main () =
     | Some f -> open_out f
   in
   if !Options.stats then begin
-    Logger.msg `STATS "Query: %a " Xpath.Ast.print_path query;
-    Logger.msg `STATS "@[Automaton: @\n%a@]" Ata.print auto;
+    List.iter (fun query ->
+      Logger.msg `STATS "Query: %a " Xpath.Ast.print_path query) queries;
+    List.iter (fun auto ->
+      Logger.msg `STATS "@[Automaton: @\n%a@]" Ata.print auto) auto_list;
   end;
 
   let module Naive = Run.Make(Naive_tree) in
-  let results =
-    time (Naive.eval auto doc) (Naive_tree.root doc) "evaluating query"
+  let result_list =
+    let root = [ Naive_tree.root doc] in
+    let f, msg =
+      match !Options.parallel, !Options.compose with
+        true, true ->
+          compose_parallel Naive.eval auto_list doc root, "parallel/compose"
+      | true, false ->
+          restart_parallel Naive.full_eval auto_list doc root, "parallel/restart"
+      | false, true ->
+          compose_sequential Naive.eval auto_list doc root , "sequential/compose"
+      | false, false ->
+          restart_sequential Naive.eval auto_list doc root, "sequential/restart"
+    in
+    time f () ("evaluating query in " ^ msg ^ " mode")
   in
   time (fun () ->
-  output_string output "<xml_result>\n";
-  if !Options.count then begin
-    output_string output (string_of_int (List.length results));
-    output_char output '\n';
-  end else
-    List.iter (fun n ->
-      Naive_tree.print_xml output doc n;
-      output_char output '\n'
-    ) results;
-  output_string output "</xml_result>\n";
-  flush output;
-  if output != stdout then close_out output
- 
-) () "serializing results"
+    let count = ref 1 in
+    List.iter (fun results ->
+      output_string output "<xml_result num=\"";
+      output_string output (string_of_int !count);
+      output_string output "\" >\n";
+      if !Options.count then begin
+        output_string output (string_of_int (List.length results));
+        output_char output '\n';
+      end else
+        List.iter (fun n ->
+          Naive_tree.print_xml output doc n;
+          output_char output '\n'
+        ) results;
+      output_string output "</xml_result>\n";
+      incr count
+    ) result_list;
+    flush output;
+    if output != stdout then close_out output
+
+  ) () "serializing results"
 
 
 let () =
@@ -77,6 +149,10 @@ let () =
   with
     Arg.Bad msg -> eprintf "Error: %s\n%!" msg; Options.usage (); exit 1
   | Sys_error msg -> eprintf "Error: %s\n%!" msg; exit 2
-  | Tree.Parse_error msg -> eprintf "Error: file %s, %s\n%!" !Options.input_file msg; exit 3
+  | Tree.Parse_error msg ->
+      eprintf "Error: %s, %s\n%!"
+        (match !Options.input_file with
+          Some s -> ("file " ^ s)
+        | None -> "[stdin]") msg; exit 3
   | Xpath.Ulexer.Error (s, e, msg) -> eprintf "Error: character %i-%i: %s\n%!" s e msg; exit 4
   | e -> eprintf "FATAL ERROR: %s\n%!" (Printexc.to_string e); exit 128