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

25 files changed, 259 insertions, 47 deletions

diff --git a/lib/kernel/doc/src/kernel_app.xml b/lib/kernel/doc/src/kernel_app.xml
index df681a505f..b342fff0d3 100644
--- a/lib/kernel/doc/src/kernel_app.xml
+++ b/lib/kernel/doc/src/kernel_app.xml
@@ -11,7 +11,7 @@
       Licensed under the Apache License, Version 2.0 (the "License");
       you may not use this file except in compliance with the License.
       You may obtain a copy of the License at
- 
+
           http://www.apache.org/licenses/LICENSE-2.0
 
       Unless required by applicable law or agreed to in writing, software
@@ -19,7 +19,7 @@
       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
       See the License for the specific language governing permissions and
       limitations under the License.
-    
+
     </legalnotice>
 
     <title>kernel</title>
@@ -58,6 +58,60 @@
   </section>
 
   <section>
+      <title>OS Signal Event Handler</title>
+      <p>Asynchronous OS signals may be subscribed to via the Kernel applications event manager
+          (see <seealso marker="doc/design_principles:des_princ">OTP Design Principles</seealso> and
+          <seealso marker="stdlib:gen_event"><c>gen_event(3)</c></seealso>) registered as <c>erl_signal_server</c>.
+          A default signal handler is installed which handles the following signals:</p>
+          <taglist>
+              <tag><c>sigusr1</c></tag>
+              <item><p>The default handler will halt Erlang and produce a crashdump
+                      with slogan "Received SIGUSR1".
+                      This is equivalent to calling <c>erlang:halt("Received SIGUSR1")</c>.
+              </p></item>
+
+              <tag><c>sigquit</c></tag>
+              <item><p>The default handler will halt Erlang immediately.
+                      This is equivalent to calling <c>erlang:halt()</c>.
+              </p></item>
+
+              <tag><c>sigterm</c></tag>
+              <item><p>The default handler will terminate Erlang normally.
+                      This is equivalent to calling <c>init:stop()</c>.
+              </p></item>
+          </taglist>
+
+          <section>
+              <title>Events</title>
+              <p>Any event handler added to <c>erl_signal_server</c> must handle the following events.</p>
+              <taglist>
+                  <tag><c>sighup</c></tag>
+                  <item><p>Hangup detected on controlling terminal or death of controlling process</p></item>
+                  <tag><c>sigquit</c></tag>
+                  <item><p>Quit from keyboard</p></item>
+                  <tag><c>sigabrt</c></tag>
+                  <item><p>Abort signal from abort</p></item>
+                  <tag><c>sigalrm</c></tag>
+                  <item><p>Timer signal from alarm</p></item>
+                  <tag><c>sigterm</c></tag>
+                  <item><p>Termination signal</p></item>
+                  <tag><c>sigusr1</c></tag>
+                  <item><p>User-defined signal 1</p></item>
+                  <tag><c>sigusr2</c></tag>
+                  <item><p>User-defined signal 2</p></item>
+                  <tag><c>sigchld</c></tag>
+                  <item><p>Child process stopped or terminated</p></item>
+                  <tag><c>sigstop</c></tag>
+                  <item><p>Stop process</p></item>
+                  <tag><c>sigtstp</c></tag>
+                  <item><p>Stop typed at terminal</p></item>
+              </taglist>
+
+              <p>Setting OS signals are described in <seealso marker="os#set_signal/2"><c>os:set_signal/2</c></seealso>.</p>
+          </section>
+  </section>
+
+  <section>
     <title>Configuration</title>
     <p>The following configuration parameters are defined for the Kernel
       application. For more information about configuration parameters,
@@ -379,6 +433,28 @@ MaxT = TickTime + TickTime / 4</code>
           return as soon as possible for <c>application_controller</c>
           to terminate properly.</p>
       </item>
+      <tag><c>source_search_rules = [DirRule] | [SuffixRule] </c></tag>
+      <item>
+	<marker id="source_search_rules"></marker>
+        <p>Where:</p>
+        <list type="bulleted">
+          <item><c>DirRule = {ObjDirSuffix,SrcDirSuffix}</c></item>
+          <item><c>SuffixRule = {ObjSuffix,SrcSuffix,[DirRule]}</c></item>
+          <item><c>ObjDirSuffix = string()</c></item>
+          <item><c>SrcDirSuffix = string()</c></item>
+          <item><c>ObjSuffix = string()</c></item>
+          <item><c>SrcSuffix = string()</c></item>
+        </list>
+        <p>Specifies a list of rules for use by <c>filelib:find_file/2</c> and
+          <c>filelib:find_source/2</c>. If this is set to some other value
+          than the empty list, it replaces the default rules. Rules can be
+          simple pairs of directory suffixes, such as <c>{"ebin",
+          "src"}</c>, which are used by <c>filelib:find_file/2</c>, or
+          triples specifying separate directory suffix rules depending on
+          file name extensions, for example <c>[{".beam", ".erl", [{"ebin",
+          "src"}]}</c>, which are used by <c>filelib:find_source/2</c>. Both
+          kinds of rules can be mixed in the list.</p>
+      </item>
     </taglist>
   </section>
 
@@ -405,4 +481,3 @@ MaxT = TickTime + TickTime / 4</code>
       <seealso marker="stdlib:timer"><c>timer(3)</c></seealso></p>
   </section>
 </appref>
-
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 9277c2d353..d80c4f077c 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -108,7 +108,7 @@
         <item>
           <p>
 	    Close stdin of commands run in os:cmd. This is a
-	    backwards compatiblity fix that restores the behaviour of
+	    backwards compatibility fix that restores the behaviour of
 	    pre 19.0 os:cmd.</p>
           <p>
 	    Own Id: OTP-13867 Aux Id: seq13178 </p>
@@ -1445,7 +1445,7 @@
 	    dependent, so applications aiming to be portable should
 	    consider using <c>{ipv6_v6only,true}</c> when creating an
 	    <c>inet6</c> listening/destination socket, and if
-	    neccesary also create an <c>inet</c> socket on the same
+	    necessary also create an <c>inet</c> socket on the same
 	    port for IPv4 traffic. See the documentation.</p>
           <p>
 	    Own Id: OTP-8928 Aux Id: kunagi-193 [104] </p>
diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml
index 739ac35d2a..6ba69d12a3 100644
--- a/lib/kernel/doc/src/os.xml
+++ b/lib/kernel/doc/src/os.xml
@@ -11,7 +11,7 @@
       Licensed under the Apache License, Version 2.0 (the "License");
       you may not use this file except in compliance with the License.
       You may obtain a copy of the License at
- 
+
           http://www.apache.org/licenses/LICENSE-2.0
 
       Unless required by applicable law or agreed to in writing, software
@@ -19,7 +19,7 @@
       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
       See the License for the specific language governing permissions and
       limitations under the License.
-    
+
     </legalnotice>
 
     <title>os</title>
@@ -156,6 +156,32 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
     </func>
 
     <func>
+      <name name="set_signal" arity="2"/>
+      <fsummary>Enables or disables handling of OS signals.</fsummary>
+      <desc>
+          <p>Enables or disables OS signals.</p>
+          <p>Each signal my be set to one of the following options:</p>
+          <taglist>
+              <tag><c>ignore</c></tag>
+              <item>
+                  This signal will be ignored.
+              </item>
+
+              <tag><c>default</c></tag>
+              <item>
+                  This signal will use the default signal handler for the operating system.
+              </item>
+
+              <tag><c>handle</c></tag>
+              <item>
+                  This signal will notify <c>erl_signal_server</c> when it is received by
+                  the Erlang runtime system.
+              </item>
+          </taglist>
+      </desc>
+    </func>
+
+    <func>
       <name name="system_time" arity="0"/>
       <fsummary>Current OS system time.</fsummary>
       <desc>
@@ -296,4 +322,3 @@ calendar:now_to_universal_time(TS),
     </func>
   </funcs>
 </erlref>
-
diff --git a/lib/kernel/include/inet.hrl b/lib/kernel/include/inet.hrl
index b39df8c3f2..df788aca08 100644
--- a/lib/kernel/include/inet.hrl
+++ b/lib/kernel/include/inet.hrl
@@ -22,7 +22,7 @@
 
 -record(hostent,
 	{
-	 h_name		  :: inet:hostname(),	%% offical name of host
+	 h_name		  :: inet:hostname(),	%% official name of host
 	 h_aliases = []   :: [inet:hostname()],	%% alias list
 	 h_addrtype	  :: 'inet' | 'inet6',	%% host address type
 	 h_length	  :: non_neg_integer(),	%% length of address
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().
 
diff --git a/lib/kernel/test/application_SUITE.erl b/lib/kernel/test/application_SUITE.erl
index 81407e9d96..b4cf31b210 100644
--- a/lib/kernel/test/application_SUITE.erl
+++ b/lib/kernel/test/application_SUITE.erl
@@ -1498,7 +1498,7 @@ otp_5363(Conf) when is_list(Conf) ->
 %% Ticket: OTP-5606
 %% Slogan: Problems with starting a distributed application
 %%-----------------------------------------------------------------
-%% Test of several processes simultanously starting the same
+%% Test of several processes simultaneously starting the same
 %% distributed application.
 otp_5606(Conf) when is_list(Conf) ->
 
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 4914ce9e4c..f368232bfc 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -323,7 +323,7 @@ load_abs(Config) when is_list(Config) ->
     {error, nofile} = code:load_abs(TestDir ++ "/duuuumy_mod"),
     {error, badfile} = code:load_abs(TestDir ++ "/code_a_test"),
     {'EXIT', _} = (catch code:load_abs({})),
-    {'EXIT', _} = (catch code:load_abs("Non-latin-имя-файла")),
+    {error, nofile} = code:load_abs("Non-latin-имя-файла"),
     {module, code_b_test} = code:load_abs(TestDir ++ "/code_b_test"),
     code:stick_dir(TestDir),
     {error, sticky_directory} = code:load_abs(TestDir ++ "/code_b_test"),
diff --git a/lib/kernel/test/erl_distribution_SUITE.erl b/lib/kernel/test/erl_distribution_SUITE.erl
index f630896e03..09c80a0956 100644
--- a/lib/kernel/test/erl_distribution_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_SUITE.erl
@@ -233,7 +233,7 @@ time_ping(Node) ->
     erlang:convert_time_unit(T1 - T0, native, millisecond).
 
 %% Keep the connection with the client node up.
-%% This is neccessary as the client node runs with much shorter
+%% This is necessary as the client node runs with much shorter
 %% tick time !!
 keep_conn(Node) ->
     sleep(1),
@@ -1059,7 +1059,7 @@ monitor_nodes_otp_6481_test(Config, TestType) when is_list(Config) ->
     RemotePid = spawn(Node,
 		      fun () ->
 			      receive after 1500 -> ok end,
-			      %% infinit loop of msgs
+			      %% infinite loop of msgs
 			      %% we want an endless stream of messages and the kill
 			      %% the node mercilessly.
 			      %% We then want to ensure that the nodedown message arrives
diff --git a/lib/kernel/test/erl_distribution_wb_SUITE.erl b/lib/kernel/test/erl_distribution_wb_SUITE.erl
index 6a23ad0d11..61aa3b32ee 100644
--- a/lib/kernel/test/erl_distribution_wb_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_wb_SUITE.erl
@@ -30,7 +30,7 @@
 
 %% 1)
 %%
-%% Connections are now always set up symetrically with respect to
+%% Connections are now always set up symmetrically with respect to
 %% publication. If connecting node doesn't send DFLAG_PUBLISHED
 %% the other node wont send DFLAG_PUBLISHED. If the connecting
 %% node send DFLAG_PUBLISHED but the other node doesn't send
diff --git a/lib/kernel/test/error_logger_SUITE.erl b/lib/kernel/test/error_logger_SUITE.erl
index b6e7551741..bb01c2384d 100644
--- a/lib/kernel/test/error_logger_SUITE.erl
+++ b/lib/kernel/test/error_logger_SUITE.erl
@@ -30,6 +30,7 @@
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2, 
+         off_heap/1,
 	 error_report/1, info_report/1, error/1, info/1,
 	 emulator/1, tty/1, logfile/1, add/1, delete/1]).
 
@@ -45,7 +46,7 @@ suite() ->
      {timetrap,{minutes,1}}].
 
 all() -> 
-    [error_report, info_report, error, info, emulator, tty,
+    [off_heap, error_report, info_report, error, info, emulator, tty,
      logfile, add, delete].
 
 groups() -> 
@@ -66,6 +67,16 @@ end_per_group(_GroupName, Config) ->
 
 %%-----------------------------------------------------------------
 
+off_heap(_Config) ->
+    %% The error_logger process may receive a huge amount of
+    %% messages. Make sure that they are stored off heap to
+    %% avoid exessive GCs.
+    MQD = message_queue_data,
+    {MQD,off_heap} = process_info(whereis(error_logger), MQD),
+    ok.
+
+%%-----------------------------------------------------------------
+
 error_report(Config) when is_list(Config) ->
     error_logger:add_report_handler(?MODULE, self()),
     Rep1 = [{tag1,"data1"},{tag2,data2},{tag3,3}],
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index f2094431d8..b402f01758 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -18,7 +18,7 @@
 %% %CopyrightEnd%
 %%
 
-%% This is a developement feature when developing a new file module,
+%% This is a development feature when developing a new file module,
 %% ugly but practical.
 -ifndef(FILE_MODULE).
 -define(FILE_MODULE, file).
diff --git a/lib/kernel/test/file_SUITE_data/realmen.html b/lib/kernel/test/file_SUITE_data/realmen.html
index c810a5d088..92e13f23b8 100644
--- a/lib/kernel/test/file_SUITE_data/realmen.html
+++ b/lib/kernel/test/file_SUITE_data/realmen.html
@@ -237,7 +237,7 @@ destroy most of the interesting uses for EQUIVALENCE, and make it
 impossible to modify the operating system code with negative
 subscripts. Worst of all, bounds checking is inefficient.
 
-<LI> Source code maintainance systems. A Real Programmer keeps his
+<LI> Source code maintenance systems. A Real Programmer keeps his
 code locked up in a card file, because it implies that its owner
 cannot leave his important programs unguarded [5].
 
@@ -396,7 +396,7 @@ double stuff Oreos for special occasions.
 
 <LI> Underneath the Oreos is a flow-charting template, left there by
 the previous occupant of the office. (Real Programmers write programs,
-not documentation. Leave that to the maintainence people.)
+not documentation. Leave that to the maintenance people.)
 
 </UL> <P>
 
diff --git a/lib/kernel/test/multi_load_SUITE.erl b/lib/kernel/test/multi_load_SUITE.erl
index 369e25ac64..920839f4f9 100644
--- a/lib/kernel/test/multi_load_SUITE.erl
+++ b/lib/kernel/test/multi_load_SUITE.erl
@@ -144,14 +144,14 @@ prep_magic([H|T]) ->
 prep_magic(Tuple) when is_tuple(Tuple) ->
     L = prep_magic(tuple_to_list(Tuple)),
     list_to_tuple(L);
-prep_magic(Bin) when is_binary(Bin) ->
-    try erlang:has_prepared_code_on_load(Bin) of
+prep_magic(Ref) when is_reference(Ref) ->
+    try erlang:has_prepared_code_on_load(Ref) of
 	false ->
-	    %% Create a different kind of magic binary.
+	    %% Create a different kind of magic ref.
 	    ets:match_spec_compile([{'_',[true],['$_']}])
     catch
 	_:_ ->
-	    Bin
+	    Ref
     end;
 prep_magic(Other) ->
     Other.
diff --git a/lib/kernel/test/rpc_SUITE.erl b/lib/kernel/test/rpc_SUITE.erl
index 1c72ddc87f..d76c4097d8 100644
--- a/lib/kernel/test/rpc_SUITE.erl
+++ b/lib/kernel/test/rpc_SUITE.erl
@@ -21,7 +21,8 @@
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2]).
--export([call/1, block_call/1, multicall/1, multicall_timeout/1, 
+-export([off_heap/1,
+         call/1, block_call/1, multicall/1, multicall_timeout/1,
 	 multicall_dies/1, multicall_node_dies/1,
 	 called_dies/1, called_node_dies/1, 
 	 called_throws/1, call_benchmark/1, async_call/1]).
@@ -35,7 +36,7 @@ suite() ->
      {timetrap,{minutes,2}}].
 
 all() -> 
-    [call, block_call, multicall, multicall_timeout,
+    [off_heap, call, block_call, multicall, multicall_timeout,
      multicall_dies, multicall_node_dies, called_dies,
      called_node_dies, called_throws, call_benchmark,
      async_call].
@@ -55,6 +56,13 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
+off_heap(_Config) ->
+    %% The rex server process may receive a huge amount of
+    %% messages. Make sure that they are stored off heap to
+    %% avoid exessive GCs.
+    MQD = message_queue_data,
+    {MQD,off_heap} = process_info(whereis(rex), MQD),
+    ok.
 
 
 %% Test different rpc calls.