File 0313-erts-Flush-messages-before-doing-init-rest... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0313-erts-Flush-messages-before-doing-init-restart.patch of Package erlang (Revision a2c746346df91f7eba485155dba10e85)

Currently displaying revision a2c746346df91f7eba485155dba10e85 , Show latest

From 994a1229418c34846c1e2b5d08e72aa30ac5fa5f Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Tue, 10 Apr 2018 10:17:30 +0200
Subject: [PATCH] erts: Flush messages before doing init restart

If messages are not flushed they would cause problems when
the system is booting. For instance module load requests
would be issued before the prim loader has been launched.
---
 erts/preloaded/ebin/init.beam | Bin 50472 -> 50596 bytes
 erts/preloaded/src/init.erl   |   9 +++++++++
 2 files changed, 9 insertions(+)

diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl
index e0ae6b1656..0c74169e97 100644
--- a/erts/preloaded/src/init.erl
+++ b/erts/preloaded/src/init.erl
@@ -545,6 +545,8 @@ stop(Reason,State) ->
     do_stop(Reason,State1).
 
 do_stop(restart,#state{start = Start, flags = Flags, args = Args}) ->
+    %% Make sure we don't have any outstanding messages before doing the restart.
+    flush(),
     boot(Start,Flags,Args);
 do_stop(reboot,_) ->
     halt();
@@ -560,6 +562,13 @@ clear_system(BootPid,State) ->
     shutdown_pids(Heart,BootPid,State),
     unload(Heart).
 
+flush() ->
+    receive
+        _M -> flush()
+    after 0 ->
+            ok
+    end.
+
 stop_heart(State) ->
     case get_heart(State#state.kernel) of
 	false ->
-- 
2.16.3

Places

File 0313-erts-Flush-messages-before-doing-init-restart.patch of Package erlang (Revision a2c746346df91f7eba485155dba10e85)

Places