X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=src%2Fmain.ml;h=2534d01e9a897f9d06bd6d25749a6c1510c9d42e;hb=5c2d599b89c01c879f685655545a5e212a5cdcd2;hp=cc14ce2c229779ddfefe58e80468f5377c2e903f;hpb=a145e1cff02534a93be2544303551c7ea94f0083;p=SXSI%2Fxpathcomp.git diff --git a/src/main.ml b/src/main.ml index cc14ce2..2534d01 100644 --- a/src/main.ml +++ b/src/main.ml @@ -17,12 +17,12 @@ let tuned_gc = { default_gc with Gc.major_heap_increment = 8*1024*1024; Gc.max_overhead = 1000000; Gc.space_overhead = 100; - } +} let mk_runtime run auto doc arg count print outfile = fun () -> if !Options.do_perf then start_perf (); - let r = time ~count:1 ~msg:"Execution time" (run auto doc) arg in + let r = time ~count:!Options.repeat ~msg:"Execution time" (run auto doc) arg in if !Options.do_perf then stop_perf (); Logger.print Format.err_formatter "Number of results: %i@\n" (count r); match outfile with @@ -31,15 +31,15 @@ let mk_runtime run auto doc arg count print outfile = time ~count:1 ~msg:"Serialization time" (print file doc) r ;; - let main v query_string output = Tag.init (Tree.tag_operations v); + if !Options.docstats then Tree.stats v; let query = time ~msg:"Parsing query" XPath.parse query_string in if !Options.verbose then begin Logger.print Format.err_formatter "Parsed query:@\n%a@\n" - XPath.Ast.print query; + XPath.Ast.print query; end; let auto, bu_info = time ~msg:"Compiling query" Compile.compile query @@ -49,34 +49,34 @@ let main v query_string output = Gc.compact(); Gc.set (tuned_gc); let runtime = - match !Options.bottom_up, bu_info with + match !Options.bottom_up, bu_info with | true, Some [ (query, pattern) ] -> if !Options.count_only then - let module R = ResJIT.Count in - let module M = Runtime.Make(R) in - mk_runtime M.bottom_up_run auto v (query, pattern) R.NS.length R.NS.serialize None + let module R = ResJIT.Count in + let module M = Runtime.Make(R) in + mk_runtime M.bottom_up_run auto v (query, pattern) R.NS.length R.NS.serialize !Options.output_file else - let module R = ResJIT.Mat in - let module M = Runtime.Make(R) in - mk_runtime M.bottom_up_run auto v (query, pattern) R.NS.length R.NS.serialize !Options.output_file + let module R = ResJIT.Mat in + let module M = Runtime.Make(R) in + mk_runtime M.bottom_up_run auto v (query, pattern) R.NS.length R.NS.serialize !Options.output_file | _ -> - (* run the query top_down *) + (* run the query top_down *) if !Options.bottom_up then - Logger.print Format.err_formatter "Cannot run the query in bottom-up mode, using top-down evaluator@\n@?"; + Logger.print Format.err_formatter "Cannot run the query in bottom-up mode, using top-down evaluator@\n@?"; if !Options.count_only then - let module R = ResJIT.Count in - let module M = Runtime.Make(R) in - if !Options.twopass then - mk_runtime M.twopass_top_down_run auto v Tree.root R.NS.length R.NS.serialize None - else - mk_runtime M.top_down_run auto v Tree.root R.NS.length R.NS.serialize None + let module R = ResJIT.Count in + let module M = Runtime.Make(R) in + if !Options.twopass then + mk_runtime M.twopass_top_down_run auto v Tree.root R.NS.length R.NS.serialize None + else + mk_runtime M.top_down_run auto v Tree.root R.NS.length R.NS.serialize !Options.output_file else - let module R = ResJIT.Mat in - let module M = Runtime.Make(R) in - mk_runtime M.top_down_run auto v Tree.root R.NS.length R.NS.serialize !Options.output_file + let module R = ResJIT.Mat in + let module M = Runtime.Make(R) in + mk_runtime M.top_down_run auto v Tree.root R.NS.length R.NS.serialize !Options.output_file in runtime () ;; @@ -86,61 +86,14 @@ let () = Options.parse_cmdline() let _ = try Printexc.record_backtrace true; - let document = - if Filename.check_suffix !Options.input_file ".g.bin" || - Filename.check_suffix !Options.input_file ".g" - then - let is_index = Filename.check_suffix !Options.input_file ".g.bin" in - let g = - if is_index then - time ~msg:"Loading grammar" (Grammar2.load) !Options.input_file - else - let g = time ~msg:"Parsing grammar file" Grammar2.parse !Options.input_file in - if !Options.save_file <> "" then - time ~msg:"Saving index" (Grammar2.save g) !Options.save_file; - g - in - begin - (* TODO Factorise with main *) - Tag.init (Grammar2.tag_operations g); - let query = - time ~msg:"Parsing query" XPath.parse !Options.query - in - if !Options.verbose then begin - Printf.eprintf "Parsed query:\n%!"; - XPath.Ast.print Format.err_formatter query; - Format.fprintf Format.err_formatter "\n%!" - end; - let auto, bu_info = - time ~msg:"Compiling query" (Compile.compile) query - in - if !Options.verbose then Ata.print Format.err_formatter auto; - Gc.full_major(); - Gc.compact(); - Gc.set (tuned_gc); - let runtime = - if !Options.count_only then - let module R = ResJIT.Make(NodeSet.Partial(NodeSet.Count)) in - let module M = Runtime.Make(R) in - (* mk_runtime run auto doc arg count print outfile *) - mk_runtime M.grammar_run auto (Obj.magic g) () R.NS.length (Obj.magic R.NS.serialize) None - else - let module R = ResJIT.Mat in - let module M = Runtime.Make(R) in - (* mk_runtime run auto doc arg count print outfile *) - mk_runtime M.grammar_run auto (Obj.magic g) () R.NS.length (Obj.magic R.NS.serialize) None - in - runtime (); - exit 0 - end - else if Filename.check_suffix !Options.input_file ".srx" + if Filename.check_suffix !Options.input_file ".srx" then time ~msg:"Loading file" (Tree.load ~sample:!Options.sample_factor - ~load_text:true) + ~load_text:(not !Options.disable_text_collection)) !Options.input_file else let v = @@ -149,9 +102,9 @@ let _ = (Tree.parse_xml_uri) !Options.input_file in - let () = - if !Options.save_file <> "" - then + let () = + if !Options.save_file <> "" + then time ~msg:"Writing file to disk" (Tree.save v) @@ -173,5 +126,3 @@ let _ = Logger.print Format.err_formatter "BACKTRACE: %s@\n@?" (Printexc.get_backtrace()); Logger.print Format.err_formatter "FATAL ERROR: %s@\n@?" (Printexc.to_string e); exit 2 - -