Merge branch 'master' into sverker/enif_select

Conflicts:
	erts/emulator/beam/erl_binary.h
	erts/emulator/beam/erl_monitors.c
	erts/emulator/beam/erl_nif.c
	erts/emulator/beam/global.h
	erts/emulator/test/nif_SUITE_data/nif_SUITE.c

1 files changed, 0 insertions, 41 deletions

diff --git a/lib/percept/doc/src/sorter.erl b/lib/percept/doc/src/sorter.erl
deleted file mode 100644
index 8d5f2c715c..0000000000
--- a/lib/percept/doc/src/sorter.erl
+++ /dev/null
@@ -1,41 +0,0 @@
--module(sorter).
--export([go/3,loop/0,main/4]).
-
-go(I,N,M) ->
-    spawn(?MODULE, main, [I,N,M,self()]),
-    receive done -> ok end.
-
-main(I,N,M,Parent) ->
-    Pids = lists:foldl(
-	fun(_,Ps) -> 
-	    [ spawn(?MODULE,loop, []) | Ps]
-	end, [], lists:seq(1,M)),
-
-    lists:foreach(
-	fun(_) -> 
-	    send_work(N,Pids),
-	    gather(Pids)
-	end, lists:seq(1,I)),
-
-    lists:foreach(
-	fun(Pid) ->
-	    Pid ! {self(), quit}
-	end, Pids),
-
-    gather(Pids), Parent ! done.
-
-send_work(_,[]) -> ok;
-send_work(N,[Pid|Pids]) ->
-    Pid ! {self(),sort,N},
-    send_work(round(N*1.2),Pids).
-
-loop() ->
-    receive
-	{Pid, sort, N} -> dummy_sort(N),Pid ! {self(), done},loop();
-	{Pid, quit} -> Pid ! {self(), done}
-    end.
-	    
-dummy_sort(N) -> lists:sort([ random:uniform(N) || _ <- lists:seq(1,N)]).
-
-gather([]) -> ok;
-gather([Pid|Pids]) -> receive {Pid, done} -> gather(Pids) end.