Updated dining-philos examples

mistupv · Dec 6, 2017 · ec1416a · ec1416a
1 parent a1762ce
commit ec1416a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 29 deletions.
diff --git a/examples/dining.erl b/examples/dining.erl
@@ -1,11 +1,8 @@
 -module(dining).
--export([main/0, waiter/1, fork/1, philo/2]).
+-export([main/0, waiter/0, fork/1, philo/2]).
 
 main() ->
-  spawn(?MODULE, waiter, [self()]),
-  receive
-    table_prepared -> ok
-  end.
+  spawn(?MODULE, waiter, []).
 
 spawn_forks(0, Dict) ->
   Dict;
@@ -19,10 +16,9 @@ spawn_philos(N, Dict, Pid) ->
   Pair = {spawn(?MODULE, philo, [Pid, N]), N},
   spawn_philos(N-1, [Pair] ++ Dict, Pid).
 
-waiter(DiningPid) ->
+waiter() ->
   ForkDict = spawn_forks(5, []),
   PhiloDict = spawn_philos(5, [], self()),
-  DiningPid ! table_prepared,
   waiter_1(ForkDict, PhiloDict).
 
 waiter_1(ForkDict, PhiloDict) ->

diff --git a/examples/dining_bug.erl b/examples/dining_bug.erl
@@ -1,11 +1,8 @@
 -module(dining_bug).
--export([main/0, waiter/1, fork/1, philo/2]).
+-export([main/0, waiter/0, fork/1, philo/2]).
 
 main() ->
-  spawn(?MODULE, waiter, [self()]),
-  receive
-    table_prepared -> ok
-  end.
+  spawn(?MODULE, waiter, []).
 
 spawn_forks(0, Dict) ->
   Dict;
@@ -19,10 +16,9 @@ spawn_philos(N, Dict, Pid) ->
   Pair = {spawn(?MODULE, philo, [Pid, N]), N},
   spawn_philos(N-1, [Pair] ++ Dict, Pid).
 
-waiter(DiningPid) ->
+waiter() ->
   ForkDict = spawn_forks(5, []),
   PhiloDict = spawn_philos(5, [], self()),
-  DiningPid ! table_prepared,
   waiter_1(ForkDict, PhiloDict).
 
 waiter_1(ForkDict, PhiloDict) ->

diff --git a/examples/dining_simple.erl b/examples/dining_simple.erl
@@ -1,11 +1,8 @@
 -module(dining_simple).
--export([main/0, waiter/1, fork/1, philo/2]).
+-export([main/0, waiter/0, fork/1, philo/2]).
 
 main() ->
-  spawn(?MODULE, waiter, [self()]),
-  receive
-    table_prepared -> ok
-  end.
+  spawn(?MODULE, waiter, []).
 
 spawn_forks(0, Dict) ->
   Dict;
@@ -19,10 +16,9 @@ spawn_philos(N, Dict, Pid) ->
   Pair = {spawn(?MODULE, philo, [Pid, N]), N},
   spawn_philos(N-1, [Pair] ++ Dict, Pid).
 
-waiter(DiningPid) ->
+waiter() ->
   ForkDict = spawn_forks(5, []),
   PhiloDict = spawn_philos(5, [], self()),
-  DiningPid ! table_prepared,
   waiter_1(ForkDict, PhiloDict).
 
 waiter_1(ForkDict, PhiloDict) ->

diff --git a/examples/dining_simple_bug.erl b/examples/dining_simple_bug.erl
@@ -1,11 +1,8 @@
--module(dining_simple).
--export([main/0, waiter/1, fork/1, philo/2]).
+-module(dining_simple_bug).
+-export([main/0, waiter/0, fork/1, philo/2]).
 
 main() ->
-  spawn(?MODULE, waiter, [self()]),
-  receive
-    table_prepared -> ok
-  end.
+  spawn(?MODULE, waiter, []).
 
 spawn_forks(0, Dict) ->
   Dict;
@@ -19,10 +16,9 @@ spawn_philos(N, Dict, Pid) ->
   Pair = {spawn(?MODULE, philo, [Pid, N]), N},
   spawn_philos(N-1, [Pair] ++ Dict, Pid).
 
-waiter(DiningPid) ->
+waiter() ->
   ForkDict = spawn_forks(5, []),
   PhiloDict = spawn_philos(5, [], self()),
-  DiningPid ! table_prepared,
   waiter_1(ForkDict, PhiloDict).
 
 waiter_1(ForkDict, PhiloDict) ->