X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Ftatoo.ml;h=24e212f6ba340e7f954112427758b62039ec240a;hb=33cc91c072d0c3ee3f17911f6484a24f55a3408b;hp=1dff2a42252c4830f5c665aeb4ac7b16d082d7ca;hpb=88375a854dab33de2193a7da5be652ae50f2ca64;p=tatoo.git
diff --git a/src/tatoo.ml b/src/tatoo.ml
index 1dff2a4..24e212f 100644
--- a/src/tatoo.ml
+++ b/src/tatoo.ml
@@ -24,52 +24,131 @@ 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 auto = time Ata.copy auto "copying Automaton" in
let output =
match !Options.output_file with
| None | Some "-" | Some "/dev/stdout" -> stdout
| 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 module Naive = Run.Make(Naive_tree)(Naive_node_list) in
+ let result_list =
+
+ let root = Naive_node_list.(add (Naive_tree.root doc) (create())) 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
+ let s = Naive.stats () in
+ Run.(
+ Logger.msg `STATS
+ "@[tree size: %d@\ntraversals: %d@\ntransition fetch cache hit ratio: %f@\ntransition eval cache hit ratio: %f@]"
+ s.tree_size s.run
+ (float s.fetch_trans_cache_hit /. float s.fetch_trans_cache_access)
+ (float s.eval_trans_cache_hit /. float s.eval_trans_cache_access));
time (fun () ->
- 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 "\n";
- flush output;
- if output != stdout then close_out output
+ let count = ref 1 in
+ List.iter (fun results ->
+ output_string output "\n";
+ if !Options.count then begin
+ output_string output (string_of_int (Naive_node_list.length results));
+ output_char output '\n';
+ end else
+ Naive_node_list.iter (fun n ->
+ Naive_tree.print_xml output doc n;
+ output_char output '\n'
+ ) results;
+ output_string output "\n";
+ incr count
+ ) result_list;
+ flush output;
+ if output != stdout then close_out output
-) () "serializing results"
+ ) () "serializing results"
let () =
@@ -78,6 +157,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