Changeset 95 for trunk/src/compiler.erl

Timestamp:

04/11/10 19:19:02 (22 months ago)

Author:

dom

Message:

Two improvements (and new start API): multiple directories watched, and slave started if no node given

File:

• trunk/src/compiler.erl (modified) (3 diffs)

trunk/src/compiler.erl

@@ -8 +8 @@
 -export ([reset_includes/2]).
 
-init (Notify, Dir) ->
-    init (Notify, Dir, []).
+init (Notify, Dirs) ->
+    init (Notify, Dirs, []).
 
-init (Notify, Dir, Options) ->
+init (Notify, Dirs, Options) ->
+    Watchers = lists: foldl (fun watcher/2, [], Dirs),
+    Includes = [{i, D} || D <- Dirs],
+    State = {dict: new (), dict: new (), [], [], Includes ++ Options},
+    loop (Notify, Watchers, State).
+
+watcher (Dir, Acc) ->
     Args = [Dir, notify_me ()],
     Watcher = spawn_link (directory_watcher, init_recursive, Args),
-    State = {dict: new (), dict: new (), [], [], [{i, Dir} | Options]},
-    loop (Notify, Watcher, State).
-
-loop (Notify, Watcher, State) ->
+    [Watcher | Acc].
+    
+loop (Notify, Watchers, State) ->
     receive
         check ->
-            Watcher ! check,
+            [W ! check || W <- Watchers],
             {Modules, Includes, Binaries, Removed, Options} = State,
-            Received = receive_files (Watcher, Modules, Includes),
+            Received = receive_files (Modules, Includes),
             {New_modules, New_includes} = Received,
             New_options = reset_includes (New_includes, Options),
-            New_state = {New_modules, New_includes, Binaries, Removed, New_options},
+            New_state = {New_modules, New_includes, Binaries,
+                         Removed, New_options},
             Last_state =
                 if
@@ -33 +39 @@
                         New_state
                 end,
-            loop (Notify, Watcher, Last_state);
+            loop (Notify, Watchers, Last_state);
         {Pid, stop} ->
             Pid ! {self (), bye}
     end.
 
-receive_files (Watcher, Modules, Includes) ->
+receive_files (Modules, Includes) ->
 %%          Includes = sets: from_list ([D || {i, D} <- Options]),
     receive
-        {Watcher, {{file, ".erl"}, File, Event}} ->
-            receive_files (Watcher, dict: store (File, Event, Modules), Includes);
-        {Watcher, {{file, ".hrl"}, File, Event}} ->
-            receive_files (Watcher, Modules, dict: store (File, Event, Includes));
-        {Watcher, _} ->
-            receive_files (Watcher, Modules, Includes)
+        {watcher, {{file, ".erl"}, File, Event}} ->
+            receive_files (dict: store (File, Event, Modules), Includes);
+        {watcher, {{file, ".hrl"}, File, Event}} ->
+            receive_files (Modules, dict: store (File, Event, Includes));
+        {watcher, _} ->
+            receive_files (Modules, Includes)
     after 500 ->
             {Modules, Includes}
@@ -92 +98 @@
 notify_me () ->
     Self = self (),
-    fun (E) -> Self ! {self (), E} end.
+    fun (E) -> Self ! {watcher, E} end.
             
 totals (Modules) ->