Changeset 95

Timestamp:

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

Author:

dom

Message:

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

Location:

trunk

Files:

• install (modified) (1 diff)
• src/compiler.erl (modified) (3 diffs)
• src/compiler_test.erl (modified) (14 diffs)
• src/directory_tester.erl (modified) (2 diffs)
• src/directory_tester_test.erl (added)

trunk/install

@@ -6 +6 @@
 cd ebin
 erl -make
-erl -sname extremeforge_install_tester@$hostname -noinput &
 erl -kernel error_logger "{file,\"../install_errors.log\"}" \
     -sname extremeforge_installer@$hostname \
     -noinput \
-    -run directory_tester run_once ".." extremeforge_install_tester@$hostname \
-    -s shells stop_node extremeforge_install_tester@$hostname \
+    -run directory_tester run_once ".." \
     -s init stop

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) ->

trunk/src/compiler_test.erl

@@ -18 +18 @@
 -export ([reset_includes_none/0]).
 -export ([reset_includes_found/0]).
+-export ([can_be_given_several_directories/0]).
 -include_lib("stdlib/include/ms_transform.hrl").
 
@@ -25 +26 @@
     
 compiles_and_reports_progress_warnings_and_errors (Root, _) ->
-    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Root]]),
     Compiler ! check,
     Ms = receive_all (),
@@ -35 +36 @@
 
 stops (Root, _) ->
-    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Root]]),
     Compiler ! check,
     receive_all (),
@@ -68 +69 @@
     ok = fixtures: use_tree (Tree, F).
 
+can_be_given_several_directories () ->
+    Tree = [{directory, "src1", good_erl_tree ()},
+            {directory, "src2", [{file, "yo.erl", "-module(yo)."}]}],
+    ok = fixtures: use_tree (Tree, fun can_be_given_several_directories/2).
+
+can_be_given_several_directories (Root, _) ->
+    Dirs = [filename: join (Root, D) || D <- ["src1", "src2"]],
+    Compiler = spawn_link (compiler, init, [notify_me (), Dirs]),
+    Compiler ! check,
+    Ms = receive_all (),
+    Compiler ! stop,
+    [{3, 0, 0}, _, _, {3, 3, 3}, {{binaries, _}, _}] = Ms,
+    ok.
+    
 can_be_given_include_directories () ->
     Src = "-module(inc).\n-include(\"inc.hrl\").",
@@ -91 +106 @@
 
 adds_root_to_include_path (Root, _) ->
-    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Root]]),
     Compiler ! check,
     Ms = receive_all (),
@@ -113 +128 @@
 
 discovers_hrl (Root, _) ->
-    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Root]]),
     Compiler ! check,
     Ms = receive_all (),
@@ -121 +136 @@
 
 provides_binaries_when_all_compiled (Root, _) ->
-    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Root]]),
     Compiler ! check,
     Ms = receive_all (),
@@ -133 +148 @@
 
 provides_all_binaries_not_just_latest_when_all_compiled (Root, [_, File]) ->
-    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Root]]),
     Compiler ! check,
     [{2, 0, 0}, _, _, {2, 2, 1}] = receive_all (),
@@ -144 +159 @@
 
 recompiles_minimally_after_change (Root, _) ->
-    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Root]]),
     Compiler ! check,
     receive_all (),
@@ -158 +173 @@
 
 can_start_empty_and_add_files (Root, []) ->
-    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Root]]),
     Compiler ! check,
     [timeout] = receive_all (),
@@ -170 +185 @@
 
 notifies_removed_files (Root, [F, _]) ->
-    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Root]]),
     Compiler ! check,
     receive_all (),
@@ -181 +196 @@
 
 notifies_removed_files_even_if_never_compiled (Root, [F]) ->
-    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Root]]),
     Compiler ! check,
     [{1, 0, 0}, {_, _}, {1, 1, 0}] = receive_all (),
@@ -195 +210 @@
 include_no_directory (Root, _) ->
     Src = filename: join (Root, "src"),
-    Compiler = spawn_link (compiler, init, [notify_me (), Src]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Src]]),
     Compiler ! check,
     [{1, 0, 0}, {_, _}, {1, 1, 0}] = receive_all (),
@@ -204 +219 @@
     Src = filename: join (Root, "src"),
     Inc = filename: join (Root, "include"),
-    Compiler = spawn_link (compiler, init, [notify_me (), Src, [{i, Inc}]]),
+    Compiler = spawn_link (compiler, init, [notify_me (), [Src], [{i, Inc}]]),
     Compiler ! check,
     [{1, 0, 0}, {1, 1, 1}, {{binaries, _}, _}] = receive_all (),

trunk/src/directory_tester.erl

@@ -4 +4 @@
 
 -module (directory_tester).
--export ([init/1, init/3]).
--export ([run_once/1, run_once/3]).
+-export ([init/1, init/2, init/3]).
+-export ([run_once/1, run_once/2, run_once/3]).
+-export ([slave_node/1]).
+-export ([read_args/1]).
 
-run_once ([Directory, Node | Include_directories]) when is_list (Node) ->
-    Options = [{i, I} || I <- Include_directories],
-    run_once (Directory, list_to_atom (Node), [{compiler, Options}]).
+run_once (Args) ->
+    {Directories, Options} = read_args (Args),
+    run_once (Directories, Options).
 
-run_once (Directory, Node, Options) ->
-    run (start (Directory, Node, Options)).
+run_once (Directories, All_options) ->
+    Slave_args = proplists: get_value (slave, All_options),
+    Options = proplists: delete (slave, All_options),
+    run_once (Directories, slave (Slave_args), Options).
 
-init ([Directory, Node | Include_directories]) when is_list (Node) ->
-    Options = [{i, I} || I <- Include_directories],
-    init (Directory, list_to_atom (Node), [{compiler, Options}]).
+run_once (Directories, Node, Options) ->
+    run (start (Directories, Node, Options)).
+
+init (Args) ->
+    {Directories, Options} = read_args (Args),
+    init (Directories, Options).
+
+init (Directories, All_options) ->
+    Slave_args = proplists: get_value (slave, All_options),
+    Options = proplists: delete (slave, All_options),
+    init (Directories, slave (Slave_args), Options). 
     
-init (Directory, Node, Options) ->
-    loop (start (Directory, Node, Options)).
+init (Directories, Node, Options) ->
+    loop (start (Directories, Node, Options)).
 
-start (Directory, Node, Options) ->
+slave (undefined) ->
+    {Host, Name} = slave_node (node ()),
+    {ok, Slave} = slave: start_link (Host, Name),
+    Slave;
+slave (Args) when is_list (Args) ->
+    {Host, Name} = slave_node (node ()),
+    {ok, Slave} = slave: start_link (Host, Name, Args),
+    Slave.
+
+start (Directories, Node, Options) ->
     Compiler_options = options (compiler, Options),
-    Compiler_args = [notify_me (compiler), Directory, Compiler_options],
+    Compiler_args = [notify_me (compiler), Directories, Compiler_options],
     Compiler = spawn_link (compiler, init, Compiler_args),
     Tester = spawn_link (tester, init, [notify_me (tester), Node]),
@@ -29 +50 @@
     Printer = spawn_link (text_printer, init, [standard_io]),
     {Compiler, Tester, Printer}.
+
+
+slave_node (nonode@nohost) ->
+    not_alive;
+slave_node (Node) ->
+    Node_string = atom_to_list (Node),
+    [Name, Host_string] = string: tokens (Node_string, "@"),
+    Slave_name_string = Name ++ "_extremeforge_slave",
+    Slave_name = list_to_atom (Slave_name_string),
+    Host = list_to_atom (Host_string),
+    {Host, Slave_name}.
+
+read_args (Args) when length (Args) == 1 ->
+    [Dirs] = read_path_args (Args),
+    {Dirs, []};
+read_args (Args) when length (Args) == 2 ->
+    [Dirs, Incs] = read_path_args (Args),
+    Options = [{compiler, [{i, I} || I <- Incs]}],
+    {Dirs, Options};
+read_args ([Arg1, Arg2, Slave_args]) ->
+    {Dirs, C_options} = read_args ([Arg1, Arg2]),
+    {Dirs, [{slave, Slave_args} | C_options]}.
+
+read_path_args (Paths) ->
+    Dirs = [string: tokens (P, ":") || P <- Paths],
+    Not_dir = [D || D <- lists: concat (Dirs), not filelib: is_dir (D)],
+    {not_dir, []} = {not_dir, Not_dir},
+    Dirs.
 
 notify_me (Atom) ->