File 0175-Init-socket-tables-during-init-restart.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0175-Init-socket-tables-during-init-restart.patch of Package erlang (Revision c60a113e1eaed31d142b913626c9a44a)

Currently displaying revision c60a113e1eaed31d142b913626c9a44a , Show latest

From e644c65075a64103c349c2dd4e8971246e1d9951 Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Tue, 25 May 2021 19:52:37 +0200
Subject: [PATCH 1/3] Init socket tables during init:restart

---
 erts/preloaded/src/erl_init.erl    | 50 ++++++++++++++++--------------
 erts/preloaded/src/init.erl        |  4 +--
 erts/preloaded/src/prim_socket.erl |  5 ++-
 lib/kernel/test/init_SUITE.erl     |  7 +++--
 4 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/erts/preloaded/src/erl_init.erl b/erts/preloaded/src/erl_init.erl
index c19bebdd20..9596a85d4a 100644
--- a/erts/preloaded/src/erl_init.erl
+++ b/erts/preloaded/src/erl_init.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2019. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2021. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 
 %% Initial process of an Erlang system.
 
--export([start/2]).
+-export([start/2, restart/0]).
 
 %% This gets the module name given by the +i option (default 'init')
 %% and the list of command line arguments
@@ -36,10 +36,26 @@ start(Mod, BootArgs) ->
     prim_buffer:on_load(),
     prim_file:on_load(),
     %% prim_socket:on_load(), prim_net:on_load(),
-    conditional_load(prim_socket, [prim_socket, prim_net]),
+    if_loaded(
+      prim_socket,
+      fun () ->
+              prim_socket:on_load(),
+              prim_net:on_load(),
+              ok
+      end),
     %% Proceed to the specified boot module
     run(Mod, boot, BootArgs).
 
+restart() ->
+    erts_internal:erase_persistent_terms(),
+    if_loaded(
+      prim_socket,
+      fun () ->
+              prim_socket:init(),
+              ok
+      end).
+
+
 run(M, F, A) ->
     case erlang:function_exported(M, F, 1) of
 	false ->
@@ -49,25 +65,13 @@ run(M, F, A) ->
             M:F(A)
     end.
 
-conditional_load(CondMod, Mods2Load) ->
-    Loaded = erlang:loaded(),
-    %% erlang:display({?MODULE, conditional_load, Loaded}),
-    conditional_load(CondMod, Loaded, Mods2Load).
 
-conditional_load(_CondMod, [], _Mods2LOad) ->
-    ok;
-conditional_load(CondMod, [CondMod|_], Mods2Load) ->
-    on_load(Mods2Load);
-conditional_load(CondMod, [_|T], Mods2Load) ->
-    conditional_load(CondMod, T, Mods2Load).
-
-on_load([]) ->
+if_loaded(CondMod, Fun) ->
+    if_loaded(CondMod, Fun, erlang:loaded()).
+%%
+if_loaded(_CondMod, _Fun, []) ->
     ok;
-on_load([Mod|Mods]) ->
-    Mod:on_load(),
-    on_load(Mods).
-
-
-    
-
-
+if_loaded(CondMod, Fun, [CondMod | _]) ->
+    Fun();
+if_loaded(CondMod, Fun, [_ | Loaded]) ->
+    if_loaded(CondMod, Fun, Loaded).
diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl
index ea2b7db2d5..3cf837791a 100644
--- a/erts/preloaded/src/init.erl
+++ b/erts/preloaded/src/init.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2020. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2021. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -632,7 +632,7 @@ do_stop({stop,Status},State) ->
 
 do_restart(Start,Flags,Args) ->
     flush(),
-    erts_internal:erase_persistent_terms(),
+    erl_init:restart(),
     boot(Start,Flags,Args).
 
 clear_system(BootPid,State) ->
diff --git a/erts/preloaded/src/prim_socket.erl b/erts/preloaded/src/prim_socket.erl
index 45c2e79478..5b72841a32 100644
--- a/erts/preloaded/src/prim_socket.erl
+++ b/erts/preloaded/src/prim_socket.erl
@@ -22,7 +22,7 @@
 
 -compile(no_native).
 
--export([on_load/0, on_load/1]).
+-export([on_load/0, on_load/1, init/0]).
 
 -export(
    [
@@ -140,6 +140,9 @@ on_load(Extra) when is_map(Extra) ->
           end,
     ok = erlang:load_nif(atom_to_list(?MODULE), Extra_2),
     %%
+    init().
+
+init() ->
     PT =
         put_supports_table(
           protocols, fun (Protocols) -> protocols_table(Protocols) end),
diff --git a/lib/kernel/test/init_SUITE.erl b/lib/kernel/test/init_SUITE.erl
index 47e44200bf..34db4d8080 100644
--- a/lib/kernel/test/init_SUITE.erl
+++ b/lib/kernel/test/init_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2020. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2021. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -352,7 +352,6 @@ restart_with_mode(Config) when is_list(Config) ->
     %% We cannot use loose_node because it doesn't run in
     %% embedded mode so we quickly start one that exits after restarting
     {ok,[[Erl]]} = init:get_argument(progname),
-    ModPath = filename:dirname(code:which(?MODULE)),
 
     Quote = case os:type() of
                 {win32,_} ->
@@ -396,6 +395,7 @@ restart(Config) when is_list(Config) ->
     InitPid = rpc:call(Node, erlang, whereis, [init]),
     PurgerPid = rpc:call(Node, erlang, whereis, [erts_code_purger]),
     Procs = rpc:call(Node, erlang, processes, []),
+    MsgFlags = lists:sort(rpc:call(Node, socket, supports, [msg_flags])),
     MaxPid = lists:last(Procs),
     ok = rpc:call(Node, init, restart, []),
     receive
@@ -456,6 +456,9 @@ restart(Config) when is_list(Config) ->
 	    ct:fail(processes_not_greater)
     end,
 
+    %% Check that socket tables has been re-initialized; check one
+    MsgFlags = lists:sort(rpc:call(Node, socket, supports, [msg_flags])),
+
     %% Test that, for instance, the same argument still exists.
     case rpc:call(Node, init, get_argument, [c]) of
 	{ok, [["4", "5", "6"], ["7", "8", "9"]]} ->
-- 
2.26.2

Places

File 0175-Init-socket-tables-during-init-restart.patch of Package erlang (Revision c60a113e1eaed31d142b913626c9a44a)

Places