Preliminary support for the grammar.

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

diff --git a/src/main.ml b/src/main.ml
index 3932be6..cd3d275 100644 (file)
--- a/src/main.ml
+++ b/src/main.ml
@@ -19,34 +19,11 @@ let tuned_gc = { default_gc with
                   Gc.space_overhead = 100;
               }
 
-
-
-let pr_mat v r =
-  let () =
-    Printf.eprintf "Number of nodes in the result set : %i\n%!"
-      (NodeSet.Mat.length r);
-  in
-  if !Options.verbose then Printf.eprintf "Size of result set: %i kb\n"
-    (Ocaml.size_w r);
-  match !Options.output_file with
-    | None -> ()
-    | Some f ->
-      let fd, finish =
-       if f = "-" then Unix.stdout, ignore
-       else
-         Unix.openfile f [ Unix.O_WRONLY; Unix.O_TRUNC; Unix.O_CREAT ] 0o666,
-         Unix.close
-      in
-      let () =
-       time ~msg:"Serializing results"
-         (NodeSet.Mat.iter (fun node -> Tree.print_xml v node fd)) r
-      in
-      Tree.flush v fd;
-      finish fd
-
 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
+    if !Options.do_perf then stop_perf ();
     Printf.eprintf "Number of results: %i\n%!" (count r);
     match outfile with
        None -> ()
@@ -69,6 +46,8 @@ let main v query_string output =
     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 =
   match !Options.bottom_up, bu_info with
@@ -112,7 +91,13 @@ let () = Options.parse_cmdline()
 ;;
 
 let document =
-  if Filename.check_suffix !Options.input_file ".srx"
+  if Filename.check_suffix !Options.input_file ".g.bin" then
+    let g = time ~msg:"Loading grammar" (Grammar.load !Options.input_file) true in
+    begin
+      ignore(g);
+      exit 0
+    end
+  else if Filename.check_suffix !Options.input_file ".srx"
   then
     time
       ~msg:"Loading file"
@@ -141,6 +126,7 @@ in
     (*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());
+    Gc.full_major();
     Profile.summary Format.err_formatter
   with
     | Ulexer.Loc.Exc_located ((x,y),e) ->