X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=src%2Fmain.ml;h=100d0e403109604cac5bd28dd61a2e4ed7213be5;hb=refs%2Fheads%2Fnew-xml-tree;hp=8c7c81f3cfd3207cf51e3b706b3606087ccac341;hpb=a84e4fba7daf4f600958487d88f0b733fb19042e;p=SXSI%2Fxpathcomp.git diff --git a/src/main.ml b/src/main.ml index 8c7c81f..100d0e4 100644 --- a/src/main.ml +++ b/src/main.ml @@ -13,10 +13,10 @@ let () = init_timer();; let default_gc = Gc.get() let tuned_gc = { default_gc with - Gc.minor_heap_size = 32*1024*1024; - Gc.major_heap_increment = 8*1024*1024; - Gc.max_overhead = 1000000; - Gc.space_overhead = 100; + Gc.minor_heap_size = 32*1024*1024; + 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 = @@ -24,7 +24,7 @@ let mk_runtime run auto doc arg count print outfile = if !Options.do_perf then start_perf (); let r = time ~count:1 ~msg:"Execution time" (run auto doc) arg in if !Options.do_perf then stop_perf (); - Printf.eprintf "Number of results: %i\n%!" (count r); + Logger.print Format.err_formatter "Number of results: %i@\n" (count r); match outfile with None -> () | Some file -> @@ -33,17 +33,16 @@ let mk_runtime run auto doc arg count print outfile = let main v query_string output = - Tag.init (Tree.tag_pool v); + Tag.init (Tree.tag_operations v); let query = time ~msg:"Parsing query" XPath.parse query_string in if !Options.verbose then begin - Printf.eprintf "Parsed query:\n%!"; - XPath.Ast.print Format.err_formatter query; - Format.fprintf Format.err_formatter "\n%!" + Logger.print Format.err_formatter "Parsed query:@\n%a@\n" + XPath.Ast.print query; end; let auto, bu_info = - time ~msg:"Compiling query" (Compile.compile) query + time ~msg:"Compiling query" Compile.compile query in if !Options.verbose then Ata.print Format.err_formatter auto; Gc.full_major(); @@ -53,12 +52,6 @@ let main v query_string output = match !Options.bottom_up, bu_info with | true, Some [ (query, pattern) ] -> - (* let nodes = - time - ~count:1 ~msg:"Computing full text query" - (Tree.full_text_query query v) pattern - in - let nodes = Array.to_list nodes in *) if !Options.count_only then let module R = ResJIT.Count in let module M = Runtime.Make(R) in @@ -72,13 +65,14 @@ let main v query_string output = (* run the query top_down *) if !Options.bottom_up then - Printf.eprintf "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 - (* mk_runtime run auto doc arg count print outfile *) - mk_runtime M.top_down_run auto v Tree.root R.NS.length R.NS.serialize None + 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 else let module R = ResJIT.Mat in let module M = Runtime.Make(R) in @@ -89,52 +83,95 @@ let main v query_string output = let () = Options.parse_cmdline() ;; +let _ = + try + Printexc.record_backtrace true; -let document = - if Filename.check_suffix !Options.input_file ".srx" - then - time - ~msg:"Loading file" - (Tree.load - ~sample:!Options.sample_factor - ~load_text:true) - !Options.input_file - else - let v = - time - ~msg:"Parsing document" - (Tree.parse_xml_uri) - !Options.input_file - in - let () = - if !Options.save_file <> "" + 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" then time - ~msg:"Writing file to disk" - (Tree.save v) - !Options.save_file; + ~msg:"Loading file" + (Tree.load + ~sample:!Options.sample_factor + ~load_text:(not !Options.disable_text_collection)) + !Options.input_file + else + let v = + time + ~msg:"Parsing document" + (Tree.parse_xml_uri) + !Options.input_file + in + let () = + if !Options.save_file <> "" + then + time + ~msg:"Writing file to disk" + (Tree.save v) + !Options.save_file; + in + v in - v -in - try - (*Printexc.record_backtrace true; *) main document !Options.query !Options.output_file; - if !Options.verbose then Printf.eprintf "Maximum resident set size: %s\n" (read_procmem()); + if !Options.verbose then + Logger.print Format.err_formatter "Maximum resident set size: %s @\n" (read_procmem()); Gc.full_major(); Profile.summary Format.err_formatter with - | Ulexer.Loc.Exc_located ((x,y),e) -> - Printf.eprintf "character %i-%i %s\n" x y (Printexc.to_string e); - exit 1 - - | e -> - output_string stderr "\n"; - flush stderr; - Printexc.print_backtrace stderr; - Printf.eprintf "FATAL ERROR: %s\n%!" (Printexc.to_string e); - output_string stderr "\n"; - flush stderr; -(* Ptset.Int.stats(); *) - exit 2 + | Ulexer.Loc.Exc_located ((x,y),e) -> + Logger.print Format.err_formatter "character %i-%i %s@\n" x y (Printexc.to_string e); + exit 1 + + | e -> + 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