From 7e272c963e9ca14e6358192599995617c3bbe948 Mon Sep 17 00:00:00 2001
From: ygrek <ygrek@autistici.org>
Date: Tue, 17 May 2011 16:50:56 +0300
Subject: [PATCH 1/4] cache expand_module

---
 ocamlbuild/ocaml_utils.ml |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/ocamlbuild/ocaml_utils.ml b/ocamlbuild/ocaml_utils.ml
index 3dafe25..7ceca2f 100644
--- a/ocamlbuild/ocaml_utils.ml
+++ b/ocamlbuild/ocaml_utils.ml
@@ -77,6 +77,17 @@ let expand_module include_dirs module_name exts =
     end exts
   end include_dirs []
 
+let expand_module =
+  let cache = Hashtbl.create 10 in
+  fun include_dirs module_name exts ->
+    let key = (include_dirs,module_name,exts) in
+    try
+      Hashtbl.find cache key
+    with Not_found ->
+      let l = expand_module include_dirs module_name exts in
+      Hashtbl.add cache key l;
+      l
+
 let string_list_of_file file =
   with_input_file file begin fun ic ->
     Lexers.blank_sep_strings (Lexing.from_channel ic)
-- 
1.7.2.5

From 068b48197858e8a4d2996cb5081941b2b7db4f3e Mon Sep 17 00:00:00 2001
From: ygrek <ygrek@autistici.org>
Date: Tue, 17 May 2011 16:51:19 +0300
Subject: [PATCH 2/4] disable logging in Solver.self

---
 ocamlbuild/solver.ml |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ocamlbuild/solver.ml b/ocamlbuild/solver.ml
index 94b3d93..71b8765 100644
--- a/ocamlbuild/solver.ml
+++ b/ocamlbuild/solver.ml
@@ -39,15 +39,17 @@ let rec self depth on_the_go_orig target =
   let rules = Rule.get_rules () in
   let on_the_go = target :: on_the_go_orig in
 
-  dprintf 4 "==%a> %a" pp_repeat (depth, "==") Resource.print target;
+(*   dprintf 4 "==%a> %a" pp_repeat (depth, "==") Resource.print target; *)
   if List.mem target on_the_go_orig then raise (Circular(target, on_the_go_orig));
   match Resource.Cache.resource_state target with
   | Resource.Cache.Bbuilt ->
-      (dprintf 5 "%a already built" Resource.print target)
+(*       (dprintf 5 "%a already built" Resource.print target) *)
+        ()
   | Resource.Cache.Bcannot_be_built ->
-      (dprintf 5 "%a already failed" Resource.print target; failed target (Leaf target))
+      ((*dprintf 5 "%a already failed" Resource.print target; *)failed target (Leaf target))
   | Resource.Cache.Bsuspension(s) ->
-      (dprintf 5 "%a was suspended -> resuming" Resource.print target;
+(*       (dprintf 5 "%a was suspended -> resuming" Resource.print target; *)
+      (
        Resource.Cache.resume_suspension s)
   | Resource.Cache.Bnot_built_yet ->
     if not (Pathname.is_relative target) && Pathname.exists target then
@@ -107,11 +109,11 @@ and self_firsts depth on_the_go rss =
           | None -> acc
           | Some (cmd, thunk) -> (cmd :: acc1, thunk :: acc2)
     end results ([], []) in
-  let count = List.length cmds in
-  let job_debug = if !Command.jobs = 1 then 10 else 5 in
-  if count > 1 then dprintf job_debug ">>> PARALLEL: %d" count;
+  let _count = List.length cmds in
+  let _job_debug = if !Command.jobs = 1 then 10 else 5 in
+(*   if count > 1 then dprintf job_debug ">>> PARALLEL: %d" count; *)
   let opt_exn = Command.execute_many cmds in
-  if count > 1 then dprintf job_debug "<<< PARALLEL";
+(*   if count > 1 then dprintf job_debug "<<< PARALLEL"; *)
   begin match opt_exn with
   | Some(res, exn) ->
       List.iter2 (fun res thunk -> if res then thunk ()) res thunks;
-- 
1.7.2.5

From 3be9ba716148a309fa80e1279908167b668681ab Mon Sep 17 00:00:00 2001
From: ygrek <ygrek@autistici.org>
Date: Tue, 17 May 2011 16:51:39 +0300
Subject: [PATCH 3/4] specialize List.union

---
 ocamlbuild/my_std.ml         |   22 ++++++++++++++++++----
 ocamlbuild/ocaml_compiler.ml |    2 +-
 ocamlbuild/ocaml_utils.ml    |    2 +-
 ocamlbuild/signatures.mli    |    1 +
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ocamlbuild/my_std.ml b/ocamlbuild/my_std.ml
index 78286b5..9edce35 100644
--- a/ocamlbuild/my_std.ml
+++ b/ocamlbuild/my_std.ml
@@ -109,15 +109,29 @@ module List = struct
       | None -> acc
     end xs []
 
-  let rec rev_append_uniq acc =
+  let rec rev_append_uniq_gen acc =
     function
     | [] -> acc
     | x :: xs ->
-        if mem x acc then rev_append_uniq acc xs
-        else rev_append_uniq (x :: acc) xs
+        if mem x acc then rev_append_uniq_gen acc xs
+        else rev_append_uniq_gen (x :: acc) xs
 
   let union a b =
-    rev (rev_append_uniq (rev_append_uniq [] a) b)
+    rev (rev_append_uniq_gen (rev_append_uniq_gen [] a) b)
+
+  let rec mem_spec ((aa,ss) as x:('a * string)) = function
+      [] -> false
+    | (a,s)::l -> (s = ss && a = aa) || mem_spec x l
+
+  let rec rev_append_uniq_spec acc =
+    function
+    | [] -> acc
+    | x :: xs ->
+        if mem_spec x acc then rev_append_uniq_spec acc xs
+        else rev_append_uniq_spec (x :: acc) xs
+
+  let union_spec a b =
+    rev (rev_append_uniq_spec (rev_append_uniq_spec [] a) b)
 
 end
 
diff --git a/ocamlbuild/ocaml_compiler.ml b/ocamlbuild/ocaml_compiler.ml
index 6a3b9ba..c7994d0 100644
--- a/ocamlbuild/ocaml_compiler.ml
+++ b/ocamlbuild/ocaml_compiler.ml
@@ -140,7 +140,7 @@ let rec prepare_link tag cmx extensions build =
   let ml = Pathname.update_extensions "ml" cmx in
   let mli = Pathname.update_extensions "mli" cmx in
   let modules =
-    List.union
+    List.union_spec
       (if Pathname.exists (ml-.-"depends") then path_dependencies_of ml else [])
       (if Pathname.exists (mli-.-"depends") then path_dependencies_of mli else [])
   in
diff --git a/ocamlbuild/ocaml_utils.ml b/ocamlbuild/ocaml_utils.ml
index 7ceca2f..bd59ddf 100644
--- a/ocamlbuild/ocaml_utils.ml
+++ b/ocamlbuild/ocaml_utils.ml
@@ -174,7 +174,7 @@ let read_path_dependencies =
         | (`just_try | `mandatory) as importance -> (importance, dep) :: acc
       end deps [] in
       Hashtbl.replace path_dependencies path
-        (List.union (try Hashtbl.find path_dependencies path with Not_found -> []) deps');
+        (List.union_spec (try Hashtbl.find path_dependencies path with Not_found -> []) deps');
       deps'
     end
   in read
diff --git a/ocamlbuild/signatures.mli b/ocamlbuild/signatures.mli
index 2b0d202..7e6045d 100644
--- a/ocamlbuild/signatures.mli
+++ b/ocamlbuild/signatures.mli
@@ -33,6 +33,7 @@ module type LIST = sig
   val print : (Format.formatter -> 'a -> 'b) -> Format.formatter -> 'a list -> unit
   val filter_opt : ('a -> 'b option) -> 'a list -> 'b list
   val union : 'a list -> 'a list -> 'a list
+  val union_spec : ('a * string) list -> ('a * string) list -> ('a * string) list
 
   (* Original functions *)
   include Std_signatures.LIST
-- 
1.7.2.5

From 862fbd13a442f9c75b10bff139fb9b7e01cfcccf Mon Sep 17 00:00:00 2001
From: ygrek <ygrek@autistici.org>
Date: Tue, 17 May 2011 17:00:55 +0300
Subject: [PATCH 4/4] specialize hashtbl for Resource.Cache

---
 ocamlbuild/resource.ml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ocamlbuild/resource.ml b/ocamlbuild/resource.ml
index ed90d1c..6069f34 100644
--- a/ocamlbuild/resource.ml
+++ b/ocamlbuild/resource.ml
@@ -109,6 +109,8 @@ module Cache = struct
     fprintf f "@[<2>{ @[<2>built =@ %a@];@ @[<2>changed =@ %a@];@ @[<2>dependencies =@ %a@]@ }@]"
       print_build_status e.built print_knowledge e.changed Resources.print e.dependencies
 
+  module Hashtbl = Hashtbl.Make(struct type t = Pathname.t let hash = Hashtbl.hash let equal (x:string) y = x = y end)
+
   let cache = Hashtbl.create 103
 
   let get r =
-- 
1.7.2.5