Merge branch 'maint-r15' into maint

Conflicts:
	erts/vsn.mk

5 files changed, 205 insertions, 17 deletions

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index cfee978bde..d7967212b1 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -30,6 +30,35 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 5.9.0.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    A feature test for the <c>lwsync</c> instruction
+	    performed on PowerPC hardware at runtime system startup
+	    got into an eternal loop if the instruction was not
+	    supported. This bug was introduced in erts-5.9/OTP-R15B.</p>
+          <p>
+	    Own Id: OTP-9843</p>
+        </item>
+        <item>
+          <p>
+	    I/O events could potentially be delayed for ever when
+	    enabling kernel-poll on a non-SMP runtime system
+	    executing on Solaris. When also combined with
+	    async-threads the runtime system hung before completing
+	    the boot phase. This bug was introduced in
+	    erts-5.9/OTP-R15B.</p>
+          <p>
+	    Own Id: OTP-9844</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 5.9</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c
index b6cb271f17..3817b1e4d5 100644
--- a/erts/emulator/sys/common/erl_poll.c
+++ b/erts/emulator/sys/common/erl_poll.c
@@ -1949,7 +1949,7 @@ check_fd_events(ErtsPollSet ps, SysTimeval *tv, int max_res)
 	     */
 	    struct dvpoll poll_res;
 	    int nfds = (int) erts_smp_atomic_read_nob(&ps->no_of_user_fds);
-#ifdef ERTS_SMP
+#if ERTS_POLL_USE_WAKEUP_PIPE
 	    nfds++; /* Wakeup pipe */
 #endif
 	    if (timeout > INT_MAX)
@@ -2487,7 +2487,7 @@ ERTS_POLL_EXPORT(erts_poll_info)(ErtsPollSet ps, ErtsPollInfo *pip)
     pip->memory_size = size;
 
     pip->poll_set_size = (int) erts_smp_atomic_read_nob(&ps->no_of_user_fds);
-#ifdef ERTS_SMP
+#if ERTS_POLL_USE_WAKEUP_PIPE
     pip->poll_set_size++; /* Wakeup pipe */
 #endif
 
diff --git a/erts/emulator/test/Makefile b/erts/emulator/test/Makefile
index 08d2066da3..a3dcbc4cf3 100644
--- a/erts/emulator/test/Makefile
+++ b/erts/emulator/test/Makefile
@@ -88,6 +88,7 @@ MODULES= \
 	send_term_SUITE \
 	sensitive_SUITE \
 	signal_SUITE \
+	smoke_test_SUITE \
 	statistics_SUITE \
 	system_info_SUITE \
 	system_profile_SUITE \
diff --git a/erts/emulator/test/smoke_test_SUITE.erl b/erts/emulator/test/smoke_test_SUITE.erl
new file mode 100644
index 0000000000..98f1cf1ad5
--- /dev/null
+++ b/erts/emulator/test/smoke_test_SUITE.erl
@@ -0,0 +1,139 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011. 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(smoke_test_SUITE).
+
+-include_lib("test_server/include/test_server.hrl").
+
+%-compile(export_all).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 init_per_testcase/2, end_per_testcase/2]).
+
+-export([boot_combo/1]).
+
+-define(DEFAULT_TIMEOUT, ?t:minutes(2)).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [boot_combo].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_testcase(Case, Config) when is_list(Config) ->
+    Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
+    [{testcase, Case},{watchdog, Dog}|Config].
+
+end_per_testcase(_Case, Config) when is_list(Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+%%%
+%%% The test cases -------------------------------------------------------------
+%%%
+
+boot_combo(Config) when is_list(Config) ->
+    ZFlags = os:getenv("ERL_ZFLAGS"),
+    NOOP = fun () -> ok end,
+    A42 = fun () ->
+		  case erlang:system_info(threads) of
+		      true ->
+			  42 = erlang:system_info(thread_pool_size);
+		      false ->
+			  ok
+		  end
+	  end,
+    SMPDisable = fun () -> false = erlang:system_info(smp_support) end,
+    try
+	chk_boot(Config, "+Ktrue", NOOP),
+	chk_boot(Config, "+A42", A42),
+	chk_boot(Config, "-smp disable", SMPDisable),
+	chk_boot(Config, "+Ktrue +A42", A42),
+	chk_boot(Config, "-smp disable +A42",
+		 fun () -> SMPDisable(), A42() end),
+	chk_boot(Config, "-smp disable +Ktrue", SMPDisable),
+	chk_boot(Config, "-smp disable +Ktrue +A42",
+		 fun () -> SMPDisable(), A42() end),
+	%% A lot more combos could be implemented...
+	ok
+    after
+	os:putenv("ERL_ZFLAGS", case ZFlags of
+				    false -> "";
+				    _ -> ZFlags
+				end)
+    end.
+
+%%%
+%%% Aux functions --------------------------------------------------------------
+%%%
+
+chk_boot(Config, Args, Fun) ->
+    true = os:putenv("ERL_ZFLAGS", Args),
+    Success = make_ref(),
+    Parent = self(),
+    ?t:format("--- Testing ~s~n", [Args]),
+    {ok, Node} = start_node(Config),
+    Pid = spawn_link(Node, fun () ->
+				   Fun(),
+				   Parent ! {self(), Success}
+			   end),
+    receive
+	{Pid, Success} ->
+	    Node = node(Pid),
+	    stop_node(Node),
+	    ?t:format("--- Success!~n", []),
+	    ok
+    end.
+
+start_node(Config) ->
+    start_node(Config, "").
+
+start_node(Config, Args) when is_list(Config) ->
+    ?line Pa = filename:dirname(code:which(?MODULE)),
+    ?line {A, B, C} = now(),
+    ?line Name = list_to_atom(atom_to_list(?MODULE)
+			      ++ "-"
+			      ++ atom_to_list(?config(testcase, Config))
+			      ++ "-"
+			      ++ integer_to_list(A)
+			      ++ "-"
+			      ++ integer_to_list(B)
+			      ++ "-"
+			      ++ integer_to_list(C)),
+    ?line ?t:start_node(Name, slave, [{args, "-pa "++Pa++" "++Args}]).
+
+stop_node(Node) ->
+    ?t:stop_node(Node).
+
diff --git a/erts/lib_src/pthread/ethread.c b/erts/lib_src/pthread/ethread.c
index ad29249bac..fb7d135418 100644
--- a/erts/lib_src/pthread/ethread.c
+++ b/erts/lib_src/pthread/ethread.c
@@ -123,34 +123,53 @@ ethr_ts_event *ethr_get_tse__(void)
 
 #if defined(ETHR_PPC_RUNTIME_CONF__)
 
-static volatile int lwsync_caused_sigill;
+#include <sys/wait.h>
 
 static void
 handle_lwsync_sigill(int signum)
 {
-    lwsync_caused_sigill = 1;
+    _exit(1);
 }
 
 static int
 ppc_init__(void)
 {
-    struct sigaction act, oact;
-    lwsync_caused_sigill = 0;
+    int pid;
 
-    sigemptyset(&act.sa_mask);
-    act.sa_flags = 0;
-    act.sa_handler = handle_lwsync_sigill;
-    if (sigaction(SIGILL, &act, &oact) != 0)
-	return errno;
+    /* If anything what so ever failes we assume no lwsync for safety */
+    ethr_runtime__.conf.have_lwsync = 0;
+
+    /*
+     * We perform the lwsync test (which might cause an illegal
+     * instruction signal) in a separate process in order to be
+     * completely certain that we do not mess up our own state.
+     */
+    pid = fork();
+    if (pid == 0) {
+	struct sigaction act, oact;
 
-    __asm__ __volatile__ ("lwsync\n\t" : : : "memory");
+	sigemptyset(&act.sa_mask);
+	act.sa_flags = SA_RESETHAND;
+	act.sa_handler = handle_lwsync_sigill;
+	if (sigaction(SIGILL, &act, &oact) != 0)
+	    _exit(2);
 
-    act.sa_flags = 0;
-    act.sa_handler = SIG_DFL;
-    if (sigaction(SIGILL, &act, &oact) != 0)
-	return errno;
+	__asm__ __volatile__ ("lwsync\n\t" : : : "memory");
+
+	_exit(0);
+    }
 
-    ethr_runtime__.conf.have_lwsync = (int) !lwsync_caused_sigill;
+    if (pid != -1) {
+	while (1) {
+	    int status, res;
+	    res = waitpid(pid, &status, 0);
+	    if (res == pid) {
+		if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
+		    ethr_runtime__.conf.have_lwsync = 1;
+		break;
+	    }
+	}
+    }
     return 0;
 }