Changeset 89 for trunk/src/directory_tester.erl

Timestamp:

08/07/09 06:22:22 (3 years ago)

Author:

dom

Message:

Made tester stop and added a run_once to directory_tester.

File:

• trunk/src/directory_tester.erl (modified) (2 diffs)

trunk/src/directory_tester.erl

@@ -4 +4 @@
 
 -module(directory_tester).
--export ([init/2]).
--export ([init/1]).
+-export ([init/1, init/2]).
+-export ([run_once/1, run_once/2]).
+
+run_once ([Directory, Node]) when is_list (Node) ->
+    run_once (Directory, list_to_atom (Node)).
+
+run_once (Directory, Node) ->
+    run (start (Directory, Node)).
 
 init ([Directory, Node]) when is_list (Node) ->
@@ -11 +17 @@
     
 init (Directory, Node) ->
+    loop (start (Directory, Node)).
+
+start (Directory, Node) ->
     Compiler = spawn_link (compiler, init, [notify_me (compiler), Directory]),
     Tester = spawn_link (tester, init, [notify_me (tester), Node]),
     Compiler ! check,
     Printer = spawn_link (text_printer, init, [standard_io]),
-    loop (Compiler, Tester, Printer).
+    {Compiler, Tester, Printer}.
 
 notify_me (Atom) ->
     Parent = self (),
     fun (Event) ->
-            Parent ! {self (), Atom, Event}
+            Parent ! {notify, {self (), Atom, Event}}
     end.
 
-loop (Compiler, Tester, Printer) ->
+loop ({Compiler, Tester, Printer}) ->
     receive
         stop ->
             Compiler ! {self (), stop},
-            Tester ! stop;
-        {Compiler, compiler, {{binaries, Bs}, {removed, Rs}}} ->
+            Tester ! {self (), stop};
+        {notify, {Compiler, compiler, {{binaries, Bs}, {removed, Rs}}}} ->
             delete (Rs, Tester),
             run (Bs, Tester),
-            loop (Compiler, Tester, Printer);
-        Event ->
+            loop ({Compiler, Tester, Printer});
+        {notify, Event} ->
             Printer ! Event,
-            loop (Compiler, Tester, Printer)
+            loop ({Compiler, Tester, Printer})
     after 4000 ->
             Compiler ! check,
-            loop (Compiler, Tester, Printer)
+            loop ({Compiler, Tester, Printer})
+    end.
+
+run ({Compiler, Tester, Printer}) ->
+    receive
+        {notify, {Compiler, compiler, {{binaries, Bs}, {removed, Rs}}}} ->
+            Compiler ! {self (), stop},
+            delete (Rs, Tester),
+            run (Bs, Tester),
+            Tester ! {self (), stop},
+            run ({Compiler, Tester, Printer});
+        {notify, Event} ->
+            Printer ! Event,
+            run ({Compiler, Tester, Printer});
+        {Tester, bye} ->
+            done;
+        {_, bye} ->
+            run ({Compiler, Tester, Printer})
     end.