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

12 files changed, 116 insertions, 23 deletions

diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile
index 2b72f78dcf..2a89faaf13 100644
--- a/lib/kernel/src/Makefile
+++ b/lib/kernel/src/Makefile
@@ -71,6 +71,7 @@ MODULES = \
 	erl_distribution \
 	erl_epmd \
 	erl_reply \
+	erl_signal_handler \
 	erts_debug \
 	error_handler \
 	error_logger \
diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl
index 5a7ca493cc..2a06d0cb15 100644
--- a/lib/kernel/src/code.erl
+++ b/lib/kernel/src/code.erl
@@ -489,13 +489,13 @@ prepare_check_uniq_1([], [_|_]=Errors) ->
     {error,Errors}.
 
 partition_on_load(Prep) ->
-    P = fun({_,{Bin,_,_}}) ->
-		erlang:has_prepared_code_on_load(Bin)
+    P = fun({_,{PC,_,_}}) ->
+		erlang:has_prepared_code_on_load(PC)
 	end,
     lists:partition(P, Prep).
 
 verify_prepared([{M,{Prep,Name,_Native}}|T])
-  when is_atom(M), is_binary(Prep), is_list(Name) ->
+  when is_atom(M), is_list(Name) ->
     try erlang:has_prepared_code_on_load(Prep) of
 	false ->
 	    verify_prepared(T);
@@ -562,10 +562,10 @@ prepare_loading_fun() ->
     GetNative = get_native_fun(),
     fun(Mod, FullName, Beam) ->
 	    case erlang:prepare_loading(Mod, Beam) of
-		Prepared when is_binary(Prepared) ->
-		    {ok,{Prepared,FullName,GetNative(Beam)}};
 		{error,_}=Error ->
-		    Error
+		    Error;
+		Prepared ->
+		    {ok,{Prepared,FullName,GetNative(Beam)}}
 	    end
     end.
 
diff --git a/lib/kernel/src/dist_ac.erl b/lib/kernel/src/dist_ac.erl
index 6c2fa0b6b1..e63c969b79 100644
--- a/lib/kernel/src/dist_ac.erl
+++ b/lib/kernel/src/dist_ac.erl
@@ -123,7 +123,7 @@ load_application(AppName, DistNodes) ->
     gen_server:call(?DIST_AC, {load_application, AppName, DistNodes}, infinity).
 
 takeover_application(AppName, RestartType) ->
-    case validRestartType(RestartType) of
+    case valid_restart_type(RestartType) of
 	true ->
 	    wait_for_sync_dacs(),
 	    Nodes = get_nodes(AppName),
@@ -1514,10 +1514,10 @@ dist_del_node(Appls, Node) ->
 		Appl#appl{run = NRun}
 	end, Appls).
 
-validRestartType(permanent)   -> true;
-validRestartType(temporary)   -> true;
-validRestartType(transient)   -> true;
-validRestartType(_RestartType) -> false.
+valid_restart_type(permanent)   -> true;
+valid_restart_type(temporary)   -> true;
+valid_restart_type(transient)   -> true;
+valid_restart_type(_RestartType) -> false.
 
 dist_mismatch(AppName, Node) ->
     error_msg("Distribution mismatch for application \"~p\" on nodes ~p and ~p~n",
diff --git a/lib/kernel/src/erl_signal_handler.erl b/lib/kernel/src/erl_signal_handler.erl
new file mode 100644
index 0000000000..8f924d2adc
--- /dev/null
+++ b/lib/kernel/src/erl_signal_handler.erl
@@ -0,0 +1,57 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(erl_signal_handler).
+-behaviour(gen_event).
+-export([init/1, format_status/2,
+         handle_event/2, handle_call/2, handle_info/2,
+         terminate/2, code_change/3]).
+
+-record(state,{}).
+
+init(_Args) ->
+    {ok, #state{}}.
+
+handle_event(sigusr1, S) ->
+    erlang:halt("Received SIGUSR1"),
+    {ok, S};
+handle_event(sigquit, S) ->
+    erlang:halt(),
+    {ok, S};
+handle_event(sigterm, S) ->
+    error_logger:info_msg("SIGTERM received - shutting down~n"),
+    ok = init:stop(),
+    {ok, S};
+handle_event(_SignalMsg, S) ->
+    {ok, S}.
+
+handle_info(_Info, S) ->
+    {ok, S}.
+
+handle_call(_Request, S) ->
+    {ok, ok, S}.
+
+format_status(_Opt, [_Pdict,_S]) ->
+    ok.
+
+code_change(_OldVsn, S, _Extra) ->
+    {ok, S}.
+
+terminate(_Args, _S) ->
+    ok.
diff --git a/lib/kernel/src/error_logger.erl b/lib/kernel/src/error_logger.erl
index 3523f680a3..3ee8e2c6e6 100644
--- a/lib/kernel/src/error_logger.erl
+++ b/lib/kernel/src/error_logger.erl
@@ -360,8 +360,12 @@ init(Max) when is_integer(Max) ->
 %% go back.
 init({go_back, _PostState}) ->  
     {ok, {?buffer_size, 0, []}};
-init(_) ->  %% Start and just relay to other
-    {ok, []}.             %% node if node(GLeader) =/= node().
+init(_) ->
+    %% The error logger process may receive a huge amount of
+    %% messages. Make sure that they are stored off heap to
+    %% avoid exessive GCs.
+    process_flag(message_queue_data, off_heap),
+    {ok, []}.
 
 -spec handle_event(term(), state()) -> {'ok', state()}.
 
diff --git a/lib/kernel/src/file.erl b/lib/kernel/src/file.erl
index 1971df9038..79e72cdc6d 100644
--- a/lib/kernel/src/file.erl
+++ b/lib/kernel/src/file.erl
@@ -1424,7 +1424,7 @@ path_open_first([Path|Rest], Name, Mode, LastError) ->
 	    case open(FileName, Mode) of
 		{ok, Fd} ->
 		    {ok, Fd, FileName};
-		{error, enoent} ->
+		{error, Reason} when Reason =:= enoent; Reason =:= enotdir ->
 		    path_open_first(Rest, Name, Mode, LastError);
 		Error ->
 		    Error
diff --git a/lib/kernel/src/inet_parse.erl b/lib/kernel/src/inet_parse.erl
index b0a3ee3008..9b47199e08 100644
--- a/lib/kernel/src/inet_parse.erl
+++ b/lib/kernel/src/inet_parse.erl
@@ -701,8 +701,8 @@ dup(N, E, L) when is_integer(N), N >= 1 ->
 
 
 
-%% Convert IPv4 adress to ascii
-%% Convert IPv6 / IPV4 adress to ascii (plain format)
+%% Convert IPv4 address to ascii
+%% Convert IPv6 / IPV4 address to ascii (plain format)
 ntoa({A,B,C,D}) ->
     integer_to_list(A) ++ "." ++ integer_to_list(B) ++ "." ++ 
 	integer_to_list(C) ++ "." ++ integer_to_list(D);
diff --git a/lib/kernel/src/inet_udp.erl b/lib/kernel/src/inet_udp.erl
index 8a8aa8ecca..c69791b9aa 100644
--- a/lib/kernel/src/inet_udp.erl
+++ b/lib/kernel/src/inet_udp.erl
@@ -113,7 +113,7 @@ fdopen(Fd, Opts) ->
 %% Here's how:
 %%   Reverse the list.
 %%   For each head option go through the tail and remove
-%%   all occurences of the same option from the tail.
+%%   all occurrences of the same option from the tail.
 %%   Store that head option and iterate using the new tail.
 %%   Return the list of stored head options.
 optuniquify(List) ->
@@ -122,8 +122,8 @@ optuniquify(List) ->
 optuniquify([], Result) ->
     Result;
 optuniquify([Opt | Tail], Result) ->
-    %% Remove all occurences of Opt in Tail, 
-    %% prepend Opt to Result, 
+    %% Remove all occurrences of Opt in Tail,
+    %% prepend Opt to Result,
     %% then iterate back here.
     optuniquify(Opt, Tail, [], Result).
 
diff --git a/lib/kernel/src/kernel.app.src b/lib/kernel/src/kernel.app.src
index 4d08a55c7c..25e4ddd95c 100644
--- a/lib/kernel/src/kernel.app.src
+++ b/lib/kernel/src/kernel.app.src
@@ -34,6 +34,7 @@
 	     erl_boot_server,
 	     erl_distribution,
 	     erl_reply,
+             erl_signal_handler,
 	     error_handler,
 	     error_logger,
 	     file,
diff --git a/lib/kernel/src/kernel.erl b/lib/kernel/src/kernel.erl
index 3d0ef81318..59eca242b1 100644
--- a/lib/kernel/src/kernel.erl
+++ b/lib/kernel/src/kernel.erl
@@ -32,6 +32,14 @@
 start(_, []) ->
     case supervisor:start_link({local, kernel_sup}, kernel, []) of
 	{ok, Pid} ->
+            %% add signal handler
+            case whereis(erl_signal_server) of
+                %% in case of minimal mode
+                undefined -> ok;
+                _ ->
+                    ok = gen_event:add_handler(erl_signal_server, erl_signal_handler, [])
+            end,
+            %% add error handler
 	    Type = get_error_logger_type(),
             case error_logger:swap_handler(Type) of
                 ok -> {ok, Pid, []};
@@ -131,6 +139,9 @@ init([]) ->
 		      permanent, 2000, worker, [inet_db]},
 	    NetSup = {net_sup, {erl_distribution, start_link, []}, 
 		      permanent, infinity, supervisor,[erl_distribution]},
+            SigSrv = #{id => erl_signal_server,
+                       start => {gen_event, start_link, [{local, erl_signal_server}]},
+                       type => worker, restart => permanent, shutdown => 2000, modules => dynamic},
 	    DistAC = start_dist_ac(),
 
 	    Timer = start_timer(),
@@ -141,7 +152,7 @@ init([]) ->
 			      permanent, infinity, supervisor, [?MODULE]},
 	    {ok, {SupFlags,
 		  [Code, Rpc, Global, InetDb | DistAC] ++
-		  [NetSup, Glo_grp, File,
+		  [NetSup, Glo_grp, File, SigSrv,
 		   StdError, User, Config, SafeSupervisor] ++ Timer}}
     end;
 init(safe) ->
diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl
index f8519d3a5e..c3ffcb3f70 100644
--- a/lib/kernel/src/os.erl
+++ b/lib/kernel/src/os.erl
@@ -29,7 +29,7 @@
 
 -export([getenv/0, getenv/1, getenv/2, getpid/0,
          perf_counter/0, perf_counter/1,
-         putenv/2, system_time/0, system_time/1,
+         putenv/2, set_signal/2, system_time/0, system_time/1,
 	 timestamp/0, unsetenv/1]).
 
 -spec getenv() -> [string()].
@@ -104,6 +104,15 @@ timestamp() ->
 unsetenv(_) ->
     erlang:nif_error(undef).
 
+-spec set_signal(Signal, Option) -> 'ok' when
+      Signal :: 'sighup'  | 'sigquit' | 'sigabrt' | 'sigalrm' |
+                'sigterm' | 'sigusr1' | 'sigusr2' | 'sigchld' |
+                'sigstop' | 'sigtstp',
+      Option :: 'default' | 'handle' | 'ignore'.
+
+set_signal(_Signal, _Option) ->
+    erlang:nif_error(undef).
+
 %%% End of BIFs
 
 -spec type() -> {Osfamily, Osname} when
diff --git a/lib/kernel/src/rpc.erl b/lib/kernel/src/rpc.erl
index 21bff02214..bd6ea26678 100644
--- a/lib/kernel/src/rpc.erl
+++ b/lib/kernel/src/rpc.erl
@@ -67,17 +67,27 @@
 
 %%------------------------------------------------------------------------
 
+
+%% The rex server may receive a huge amount of
+%% messages. Make sure that they are stored off heap to
+%% avoid exessive GCs.
+
+-define(SPAWN_OPTS, [{spawn_opt,[{message_queue_data,off_heap}]}]).
+
 %% Remote execution and broadcasting facility
 
 -spec start() -> {'ok', pid()} | 'ignore' | {'error', term()}.
 
 start() ->
-    gen_server:start({local,?NAME}, ?MODULE, [], []).
+    gen_server:start({local,?NAME}, ?MODULE, [], ?SPAWN_OPTS).
 
 -spec start_link() -> {'ok', pid()} | 'ignore' | {'error', term()}.
 
 start_link() ->
-    gen_server:start_link({local,?NAME}, ?MODULE, [], []).
+    %% The rex server process may receive a huge amount of
+    %% messages. Make sure that they are stored off heap to
+    %% avoid exessive GCs.
+    gen_server:start_link({local,?NAME}, ?MODULE, [], ?SPAWN_OPTS).
 
 -spec stop() -> term().