reap pmap processes when it is all done

moonpolysoft · Jan 17, 2009 · 2dd334e · 2dd334e
1 parent ba7245f
commit 2dd334e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/elibs/lib_misc.erl b/elibs/lib_misc.erl
@@ -48,12 +48,15 @@ pmap(Fun, List, ReturnNum) ->
       L = gather(N, length(List), Ref, []),
       SuperParent ! {SuperRef, pmap_sort(List, L)}
     end),
-  _Pids = [spawn(fun() -> 
+  Pids = [spawn(fun() -> 
       Parent ! {Ref, {Elem, (catch Fun(Elem))}} 
     end) || Elem <- List],
-  receive
+  Ret = receive
     {SuperRef, Ret} -> Ret
-  end.
+  end,
+  % i think we need to cleanup here.
+  lists:foreach(fun(P) -> exit(P, die) end, Pids),
+  Ret.
 
 pmap_sort(Original, Results) ->
   pmap_sort([], Original, lists:reverse(Results)).

diff --git a/etest/lib_misc_test.erl b/etest/lib_misc_test.erl
@@ -2,16 +2,16 @@
 
 pmap_test() ->
   L = [0, 1, 2],
-  [0,1] = pmap(fun(N) ->
+  ?assertEqual([0,1], pmap(fun(N) ->
       timer:sleep(N),
       N
-    end, L, 2).
+    end, L, 2)).
 
 pmap_1_test() ->
   L = [0],
-  [0] = pmap(fun(N) ->
+  ?assertEqual([0], pmap(fun(N) ->
       N
-    end, L, 1).
+    end, L, 1)).
 
 reverse_bits_test() ->
   3869426816 = reverse_bits(19088743),