Merge branch 'john/erts/prim_file-init-restart/OTP-15495/ERL-821' into maint

* john/erts/prim_file-init-restart/OTP-15495/ERL-821:
  Remove an unused variable
  Spawn prim_file helper as a system process

8 files changed, 116 insertions, 48 deletions

diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index d4ba90a61a..0e218811d8 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -725,3 +725,9 @@ bif erts_internal:counters_get/2
 bif erts_internal:counters_add/3
 bif erts_internal:counters_put/3
 bif erts_internal:counters_info/1
+
+#
+# New in 21.2.3
+#
+
+bif erts_internal:spawn_system_process/3
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 99e788c718..41bec17dfa 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -376,6 +376,27 @@ erl_init(int ncpu,
 }
 
 static Eterm
+erl_spawn_system_process(Process* parent, Eterm mod, Eterm func, Eterm args,
+                         ErlSpawnOpts *so)
+{
+    Eterm res;
+    int arity;
+
+    ERTS_LC_ASSERT(ERTS_PROC_LOCK_MAIN & erts_proc_lc_my_proc_locks(parent));
+    arity = erts_list_length(args);
+
+    if (erts_find_function(mod, func, arity, erts_active_code_ix()) == NULL) {
+	erts_exit(ERTS_ERROR_EXIT, "No function %T:%T/%i\n", mod, func, arity);
+    }
+
+    so->flags |= SPO_SYSTEM_PROC;
+
+    res = erl_create_process(parent, mod, func, args, so);
+
+    return res;
+}
+
+static Eterm
 erl_first_process_otp(char* modname, void* code, unsigned size, int argc, char** argv)
 {
     int i;
@@ -386,12 +407,6 @@ erl_first_process_otp(char* modname, void* code, unsigned size, int argc, char**
     Process parent;
     ErlSpawnOpts so;
     Eterm env;
-    
-    start_mod = erts_atom_put((byte *) modname, sys_strlen(modname), ERTS_ATOM_ENC_LATIN1, 1);
-    if (erts_find_function(start_mod, am_start, 2,
-			   erts_active_code_ix()) == NULL) {
-	erts_exit(ERTS_ERROR_EXIT, "No function %s:start/2\n", modname);
-    }
 
     /*
      * We need a dummy parent process to be able to call erl_create_process().
@@ -399,6 +414,7 @@ erl_first_process_otp(char* modname, void* code, unsigned size, int argc, char**
 
     erts_init_empty_process(&parent);
     erts_proc_lock(&parent, ERTS_PROC_LOCK_MAIN);
+
     hp = HAlloc(&parent, argc*2 + 4);
     args = NIL;
     for (i = argc-1; i >= 0; i--) {
@@ -411,44 +427,73 @@ erl_first_process_otp(char* modname, void* code, unsigned size, int argc, char**
     hp += 2;
     args = CONS(hp, env, args);
 
-    so.flags = erts_default_spo_flags|SPO_SYSTEM_PROC;
-    res = erl_create_process(&parent, start_mod, am_start, args, &so);
+    start_mod = erts_atom_put((byte *) modname, sys_strlen(modname),
+                              ERTS_ATOM_ENC_LATIN1, 1);
+
+    so.flags = erts_default_spo_flags;
+    res = erl_spawn_system_process(&parent, start_mod, am_start, args, &so);
+    ASSERT(is_internal_pid(res));
+
     erts_proc_unlock(&parent, ERTS_PROC_LOCK_MAIN);
     erts_cleanup_empty_process(&parent);
+
     return res;
 }
 
 static Eterm
 erl_system_process_otp(Eterm parent_pid, char* modname, int off_heap_msgq, int prio)
-{
-    Eterm start_mod;
-    Process* parent;
+{ 
+    Process *parent;
     ErlSpawnOpts so;
-    Eterm res;
-
-    start_mod = erts_atom_put((byte *) modname, sys_strlen(modname), ERTS_ATOM_ENC_LATIN1, 1);
-    if (erts_find_function(start_mod, am_start, 0,
-			   erts_active_code_ix()) == NULL) {
-	erts_exit(ERTS_ERROR_EXIT, "No function %s:start/0\n", modname);
-    }
+    Eterm mod, res;
 
     parent = erts_pid2proc(NULL, 0, parent_pid, ERTS_PROC_LOCK_MAIN);
+    mod = erts_atom_put((byte *) modname, sys_strlen(modname),
+                        ERTS_ATOM_ENC_LATIN1, 1);
+
+    so.flags = erts_default_spo_flags|SPO_USE_ARGS;
 
-    so.flags = erts_default_spo_flags|SPO_SYSTEM_PROC|SPO_USE_ARGS;
-    if (off_heap_msgq)
+    if (off_heap_msgq) {
         so.flags |= SPO_OFF_HEAP_MSGQ;
-    so.min_heap_size    = H_MIN_SIZE;
-    so.min_vheap_size   = BIN_VH_MIN_SIZE;
-    so.max_heap_size    = H_MAX_SIZE;
-    so.max_heap_flags   = H_MAX_FLAGS;
-    so.priority         = prio;
-    so.max_gen_gcs      = (Uint16) erts_atomic32_read_nob(&erts_max_gen_gcs);
-    so.scheduler        = 0;
-    res = erl_create_process(parent, start_mod, am_start, NIL, &so);
+    }
+
+    so.min_heap_size  = H_MIN_SIZE;
+    so.min_vheap_size = BIN_VH_MIN_SIZE;
+    so.max_heap_size  = H_MAX_SIZE;
+    so.max_heap_flags = H_MAX_FLAGS;
+    so.priority       = prio;
+    so.max_gen_gcs    = (Uint16) erts_atomic32_read_nob(&erts_max_gen_gcs);
+    so.scheduler      = 0;
+
+    res = erl_spawn_system_process(parent, mod, am_start, NIL, &so);
+    ASSERT(is_internal_pid(res));
+
     erts_proc_unlock(parent, ERTS_PROC_LOCK_MAIN);
+
     return res;
 }
 
+Eterm erts_internal_spawn_system_process_3(BIF_ALIST_3) {
+    Eterm mod, func, args, res;
+    ErlSpawnOpts so;
+
+    mod = BIF_ARG_1;
+    func = BIF_ARG_2;
+    args = BIF_ARG_3;
+
+    ASSERT(is_atom(mod));
+    ASSERT(is_atom(func));
+    ASSERT(erts_list_length(args) >= 0);
+
+    so.flags = erts_default_spo_flags;
+    res = erl_spawn_system_process(BIF_P, mod, func, args, &so);
+
+    if (is_non_value(res)) {
+        BIF_ERROR(BIF_P, so.error_code);
+    }
+
+    BIF_RET(res);
+}
 
 Eterm
 erts_preloaded(Process* p)
diff --git a/erts/emulator/nifs/common/prim_file_nif.c b/erts/emulator/nifs/common/prim_file_nif.c
index 5fff55b467..a78ee62677 100644
--- a/erts/emulator/nifs/common/prim_file_nif.c
+++ b/erts/emulator/nifs/common/prim_file_nif.c
@@ -38,7 +38,6 @@ static void unload(ErlNifEnv *env, void* priv_data);
 
 static ErlNifResourceType *efile_resource_type;
 
-static ERL_NIF_TERM am_erts_prim_file;
 static ERL_NIF_TERM am_close;
 
 static ERL_NIF_TERM am_ok;
@@ -220,7 +219,6 @@ static int load(ErlNifEnv *env, void** priv_data, ERL_NIF_TERM prim_file_pid)
         ASSERT(!"bad pid passed to prim_file_nif");
     }
 
-    am_erts_prim_file = enif_make_atom(env, "erts_prim_file");
     am_close = enif_make_atom(env, "close");
 
     am_ok = enif_make_atom(env, "ok");
diff --git a/erts/preloaded/ebin/erts_internal.beam b/erts/preloaded/ebin/erts_internal.beam
index 0bd24c3466..5b25ceeb12 100644
--- a/erts/preloaded/ebin/erts_internal.beam
+++ b/erts/preloaded/ebin/erts_internal.beam
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam
index 1e72f70c65..09184af25e 100644
--- a/erts/preloaded/ebin/prim_file.beam
+++ b/erts/preloaded/ebin/prim_file.beam
diff --git a/erts/preloaded/src/erts_internal.erl b/erts/preloaded/src/erts_internal.erl
index 8f29a569f2..305b524438 100644
--- a/erts/preloaded/src/erts_internal.erl
+++ b/erts/preloaded/src/erts_internal.erl
@@ -97,6 +97,8 @@
 -export([counters_new/1, counters_get/2, counters_add/3,
          counters_put/3, counters_info/1]).
 
+-export([spawn_system_process/3]).
+
 %%
 %% Await result of send to port
 %%
@@ -726,3 +728,10 @@ counters_put(_Ref, _Ix, _Value) ->
 -spec counters_info(reference()) -> #{}.
 counters_info(_Ref) ->
     erlang:nif_error(undef).
+
+-spec spawn_system_process(Mod, Func, Args) -> pid() when
+    Mod :: atom(),
+    Func :: atom(),
+    Args :: list().
+spawn_system_process(_Mod, _Func, _Args) ->
+    erlang:nif_error(undefined).
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
index 5fc22bc582..0994e2a9f4 100644
--- a/erts/preloaded/src/prim_file.erl
+++ b/erts/preloaded/src/prim_file.erl
@@ -46,7 +46,7 @@
 -define(MIN_READLINE_SIZE, 256).
 -define(LARGEFILESIZE, (1 bsl 63)).
 
--export([copy/3]).
+-export([copy/3, start/0]).
 
 -include("file_int.hrl").
 
@@ -85,14 +85,21 @@ is_translatable(_) ->
 
 %% This is a janitor process used to close files whose controlling process has
 %% died. The emulator will be torn down if this is killed.
-delayed_close_loop() ->
+start() ->
+    helper_loop().
+
+helper_loop() ->
     receive
         {close, FRef} when is_reference(FRef) -> delayed_close_nif(FRef);
         _ -> ok
     end,
-    delayed_close_loop().
+    helper_loop().
 
-%%
+on_load() ->
+    %% This is spawned as a system process to prevent init:restart/0 from
+    %% killing it.
+    Pid = erts_internal:spawn_system_process(?MODULE, start, []),
+    ok = erlang:load_nif(atom_to_list(?MODULE), Pid).
 
 %% Returns {error, Reason} | {ok, BytesCopied}
 copy(#file_descriptor{module = ?MODULE} = Source,
@@ -103,14 +110,6 @@ copy(#file_descriptor{module = ?MODULE} = Source,
     %% XXX Should be moved down to the driver for optimization.
     file:copy_opened(Source, Dest, Length).
 
-on_load() ->
-    Pid = spawn(fun() ->
-                    process_flag(trap_exit, true),
-                    delayed_close_loop()
-                end),
-    true = register(erts_prim_file, Pid),
-    ok = erlang:load_nif(atom_to_list(?MODULE), Pid).
-
 open(Name, Modes) ->
     %% The try/catch pattern seen here is used throughout the file to adhere to
     %% the public file interface, which has leaked through for ages because of
diff --git a/lib/kernel/test/init_SUITE.erl b/lib/kernel/test/init_SUITE.erl
index 6a006cdc01..4f90260f98 100644
--- a/lib/kernel/test/init_SUITE.erl
+++ b/lib/kernel/test/init_SUITE.erl
@@ -295,7 +295,7 @@ is_real_system(KernelVsn, StdlibVsn) ->
 %% before restart.
 %% ------------------------------------------------
 many_restarts() ->
-    [{timetrap,{minutes,8}}].
+    [{timetrap,{minutes,16}}].
 
 many_restarts(Config) when is_list(Config) ->
     {ok, Node} = loose_node:start(init_test, "", ?DEFAULT_TIMEOUT_SEC),
@@ -315,7 +315,7 @@ loop_restart(N,Node,EHPid) ->
 	    loose_node:stop(Node),
 	    ct:fail(not_stopping)
     end,
-    ok = wait_for(30, Node, EHPid),
+    ok = wait_for(60, Node, EHPid),
     loop_restart(N-1,Node,rpc:call(Node,erlang,whereis,[logger])).
 
 wait_for(0,Node,_) ->
@@ -367,7 +367,8 @@ restart(Config) when is_list(Config) ->
     SysProcs0 = rpc:call(Node, ?MODULE, find_system_processes, []),
     io:format("SysProcs0=~p~n", [SysProcs0]),
     [InitPid, PurgerPid, LitCollectorPid,
-     DirtySigNPid, DirtySigHPid, DirtySigMPid] = SysProcs0,
+     DirtySigNPid, DirtySigHPid, DirtySigMPid,
+     PrimFilePid] = SysProcs0,
     InitPid = rpc:call(Node, erlang, whereis, [init]),
     PurgerPid = rpc:call(Node, erlang, whereis, [erts_code_purger]),
     Procs = rpc:call(Node, erlang, processes, []),
@@ -385,7 +386,8 @@ restart(Config) when is_list(Config) ->
     SysProcs1 = rpc:call(Node, ?MODULE, find_system_processes, []),
     io:format("SysProcs1=~p~n", [SysProcs1]),
     [InitPid1, PurgerPid1, LitCollectorPid1,
-     DirtySigNPid1, DirtySigHPid1, DirtySigMPid1] = SysProcs1,
+     DirtySigNPid1, DirtySigHPid1, DirtySigMPid1,
+     PrimFilePid1] = SysProcs1,
 
     %% Still the same init process!
     InitPid1 = rpc:call(Node, erlang, whereis, [init]),
@@ -411,6 +413,10 @@ restart(Config) when is_list(Config) ->
     DirtySigMP = pid_to_list(DirtySigMPid),
     DirtySigMP = pid_to_list(DirtySigMPid1),
 
+    %% and same prim_file helper process!
+    PrimFileP = pid_to_list(PrimFilePid),
+    PrimFileP = pid_to_list(PrimFilePid1),
+
     NewProcs0 = rpc:call(Node, erlang, processes, []),
     NewProcs = NewProcs0 -- SysProcs1,
     case check_processes(NewProcs, MaxPid) of
@@ -437,7 +443,8 @@ restart(Config) when is_list(Config) ->
 		    literal_collector,
 		    dirty_sig_handler_normal,
 		    dirty_sig_handler_high,
-		    dirty_sig_handler_max}).
+		    dirty_sig_handler_max,
+                    prim_file}).
 
 find_system_processes() ->
     find_system_procs(processes(), #sys_procs{}).
@@ -448,7 +455,8 @@ find_system_procs([], SysProcs) ->
      SysProcs#sys_procs.literal_collector,
      SysProcs#sys_procs.dirty_sig_handler_normal,
      SysProcs#sys_procs.dirty_sig_handler_high,
-     SysProcs#sys_procs.dirty_sig_handler_max];
+     SysProcs#sys_procs.dirty_sig_handler_max,
+     SysProcs#sys_procs.prim_file];
 find_system_procs([P|Ps], SysProcs) ->
     case process_info(P, [initial_call, priority]) of
 	[{initial_call,{otp_ring0,start,2}},_] ->
@@ -472,6 +480,9 @@ find_system_procs([P|Ps], SysProcs) ->
          {priority,max}] ->
 	    undefined = SysProcs#sys_procs.dirty_sig_handler_max,
 	    find_system_procs(Ps, SysProcs#sys_procs{dirty_sig_handler_max = P});
+        [{initial_call,{prim_file,start,0}},_] ->
+	    undefined = SysProcs#sys_procs.prim_file,
+	    find_system_procs(Ps, SysProcs#sys_procs{prim_file = P});
 	_ ->
 	    find_system_procs(Ps, SysProcs)
     end.