let print_list l =
eprintf "%![%s]%!\n" (String.concat ", " l)
-(*let cxx_flags = S (List.map ( fun x -> A x) cxx_flags)*)
let _A x = A x
let _S ?(extra=N) l = S (List.map (fun e -> (S [extra; _A e] )) l)
;;
struct
open Scanf
let scan_include ml =
- let ic = try open_in ml with
- _ -> open_in (include_full_path / ml)
- in
- let includes = ref [] in
- let () =
+ let ic = open_in ml and includes = ref [] in
+ begin
try
while true do
let s = input_line ic in
if String.length s > 0 then
- try sscanf s " INCLUDE \"%s@\"" ((=::) includes)
+ try
+ sscanf s " INCLUDE \"%s@\"" (fun s -> includes =:: include_path /s)
with Scan_failure _ -> ()
done
with End_of_file -> close_in ic
- in
+ end;
!includes
let ocaml ml =
List.fold_left (fun a i -> (loop i) @ a) includes includes
in
let includes = loop ml in
- dep [ "file:" ^ ml ]
- (List.map (fun s -> include_path / s) includes)
+ dep [ "file:" ^ ml ] includes
-let parse_depends file depfile =
+let parse_depends depfile =
let ichan = open_in depfile in
let iscan = Scanning.from_channel ichan in
let includes = ref [] in
- begin
- bscanf iscan " %s@: " ignore;
- bscanf iscan " %s " ignore;
- try
- while true do
- try
- let s = bscanf iscan " %s " (fun s -> s) in
- if s = "" then raise End_of_file;
- if s <> "\\" then includes =::s
- with
- Scan_failure _ -> ()
- done
- with
- End_of_file -> close_in ichan
- end;
- !includes
-
-let uniq l =
- let rec loop l acc =
- match l with
- | [] -> acc
- | [ e ] -> e::acc
- | e1 :: ((e2 :: _) as ll) ->
- loop ll (if e1 = e2 then acc else e1 :: acc)
- in
- loop (List.sort compare l) []
+ bscanf iscan " %_s@: %s " ignore;
+ try
+ while true do
+ bscanf iscan " %s " (
+ function "" -> raise End_of_file
+ | "\\" -> ()
+ | s -> includes =::s)
+ done; []
+ with
+ _ -> close_in ichan;!includes
let cxx cpp =
- let depfile = ( cpp ^ ".depends") in
+ let depfile = !Options.build_dir /" __cxx_depends.tmp" in
let cmd = Cmd (S[ A cxx_cmd ; S !cxx_flags; cxx_include_flags ; A"-MM";
A "-MF"; P depfile; P cpp])
in
let () = Command.execute ~quiet:true ~pretend:false cmd in
- let includes = parse_depends cpp depfile in
- let includes' = uniq (List.filter (Pathname.is_relative) includes) in
+ let includes = parse_depends depfile in
+ let includes' = (List.filter (Pathname.is_relative) includes) in
dep [ "compile"; "file:" ^ cpp ] includes'
end
-let cxx_compile env build =
- let src = env "%.cpp" and obj = env "%.o" in
- let tags = (tags_of_pathname src) ++ "compile" ++ "c++" in
- Cmd(S[T tags; A cxx_cmd; A "-o" ; P obj; A "-c"; S !cxx_flags; cxx_include_flags; P src])
+let cxx_compile env _build =
+ let cpp = env "%.cpp" and obj = env "%.o" in
+ let tags = (tags_of_pathname cpp) ++ "compile" ++ "c++" in
+ Cmd(S[T tags; A cxx_cmd; A "-o" ; P obj; A "-c"; S !cxx_flags; cxx_include_flags; P cpp])
(* Native compile and link action *)
| After_rules ->
dep [ "link" ] cstub_lib;
- rule "compile cpp -> o" ~prod:"%.o" ~deps:[ "%.cpp" ] cxx_compile;
+ rule "c++: cpp & depends -> o" ~prod:"%.o" ~deps:[ "%.cpp" ] cxx_compile;
let syntax_flags = S ([ A "-syntax"; A "camlp4o";
S (ppopt [A "-printer" ; A"Camlp4OCamlAstDumper"]);
S (ppopt !pp_macro_options) ])
#include "Utils.h"
#include "common_stub.hpp"
-extern "C" {
-#include <stdio.h>
-}
-
#define CAMLRAISEMSG(msg) (sxsi_raise_msg((char*) (msg)))
-#define XMLTREE(x) (Obj_val<XMLTree>(x))
+#define XMLTREE(x) (Obj_val<XMLTree*>(x))
-#define HSET(x) (Obj_val<TagIdSet>(x))
+#define HSET(x) (Obj_val<TagIdSet*>(x))
-#define XMLTREEBUILDER(x) (Obj_val<XMLTreeBuilder>(x))
+#define XMLTREEBUILDER(x) (Obj_val<XMLTreeBuilder*>(x))
#define TREENODEVAL(i) ((treeNode) (Int_val(i)))
{
CAMLparam1(unit);
CAMLlocal1(result);
- result = sxsi_alloc_custom<XMLTreeBuilder>();
- Obj_val<XMLTreeBuilder>(result) = new XMLTreeBuilder();
+ result = sxsi_alloc_custom<XMLTreeBuilder*>();
+ Obj_val<XMLTreeBuilder*>(result) = new XMLTreeBuilder();
+
CAMLreturn(result);
}
XMLTree * tree = XMLTREEBUILDER(vbuilder)->CloseDocument();
if (tree == NULL)
CAMLRAISEMSG("CloseDocument");
- result = sxsi_alloc_custom<XMLTree>();
- Obj_val<XMLTree>(result) = tree;
+ result = sxsi_alloc_custom<XMLTree*>();
+ Obj_val<XMLTree*>(result) = tree;
CAMLreturn (result);
}
extern "C" value caml_xml_tree_load(value fd, value name, value load_tc,value sf){
CAMLparam4(fd, name, load_tc, sf);
- CAMLlocal1(result);
+ CAMLlocal2(result,tmp);
XMLTree * tree;
try {
+
tree = XMLTree::Load(Int_val(fd),Bool_val(load_tc),Int_val(sf), String_val(name));
- result = sxsi_alloc_custom<XMLTree>();
- Obj_val<XMLTree>(result) = tree;
+ result = sxsi_alloc_custom<XMLTree*>();
+
+ Obj_val<XMLTree*>(result) = tree;
+ tmp = sxsi_alloc_custom<long>();
+ Obj_val<long>(tmp) = 3l;
CAMLreturn(result);
}
catch (const std::exception& e){ CAMLRAISEMSG(e.what()); }
extern "C" value caml_unordered_set_alloc(value unit){
CAMLparam1(unit);
CAMLlocal1(hset);
- hset = sxsi_alloc_custom<TagIdSet>();
- Obj_val<TagIdSet>(hset) = new TagIdSet();
+ hset = sxsi_alloc_custom<TagIdSet*>();
+ Obj_val<TagIdSet*>(hset) = new TagIdSet();
CAMLreturn (hset);
}
if (it == type_map->end())
result = Val_unit;
else
- result = caml_alloc_custom(it->second.first, it->second.second, 1, 2);
+ result = caml_alloc_custom(it->second.first, it->second.second, 1, 1);
CAMLreturn(result);
}
extern "C" {
#define CAML_NAME_SPACE
-#include <stdlib.h>
+
#include <caml/mlvalues.h>
#include <caml/alloc.h>
#include <caml/memory.h>
#include <caml/fail.h>
#include <caml/custom.h>
#include <caml/bigarray.h>
-#include <stdio.h>
+
}
-#include <iostream>
#include <typeinfo>
+
void register_custom_(char* name,
size_t size,
void (*finalize)(value v));
value alloc_custom_(char* name);
+template <class X> X& Obj_val(value v)
+{
+ return * (X*) Data_custom_val(v);
+}
+
+template <class X> void sxsi_finalize_obj(X) {
+}
+
+template <class X> void sxsi_finalize_obj(X* x){
+ delete x;
+}
template <class X> void sxsi_finalize_custom(value v)
{
- X * obj = * ((X **) Data_custom_val(v));
- std::cerr << "Finalizing object: " << typeid(X).name() << std::endl;
- std::cerr.flush();
- delete obj;
+ sxsi_finalize_obj(Obj_val<X>(v));
}
template <class X> value sxsi_alloc_custom()
{
char * name = const_cast<char*>(typeid(X).name());
+
value v = alloc_custom_(name);
if (v == Val_unit) {
- register_custom_(name, sizeof(X*), sxsi_finalize_custom<X>);
+ register_custom_(name, sizeof(X), sxsi_finalize_custom<X>);
v = alloc_custom_(name);
};
return v;
}
-template <class X> X*& Obj_val(value v)
-{
- //Cannot use Data_custom_val here, it is not a correct lvalue. :-(
- return (X*&) Field(v,1);
-}
-
void sxsi_raise_msg(char * msg);
-extern "C" {
-value sxsi_cpp_init(value unit);
-}
+extern "C" value sxsi_cpp_init(value unit);
+
#endif
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
(*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) ->
let c, s, d, f = time ~msg:"Loading tag table"(load_table) () in
ignore(Unix.lseek fd (pos_in in_c) Unix.SEEK_SET);
let xml_tree = tree_load fd str load_text sample in
- Printf.eprintf "Root is: %i\n" (Obj.magic (tree_root xml_tree));
let () = Tag.init (Obj.magic xml_tree) in
let attributes = Ptset.Int.add Tag.attribute d.(Tag.attribute) in
let elements = Ptset.Int.add Tag.document_node
projects / SXSI / xpathcomp.git / commitdiff