erts: Fix so that prim_tty can be reloaded

This is needed for when prim_tty is cover compiled.
erlang · Aug 29, 2022 · 919561f · 919561f
1 parent 759f609
commit 919561f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/erts/emulator/nifs/common/prim_tty_nif.c b/erts/emulator/nifs/common/prim_tty_nif.c
@@ -996,9 +996,7 @@ static void tty_select_stop(ErlNifEnv* caller_env, void* obj, ErlNifEvent event,
 #endif
 }
 
-static int load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info)
-{
-
+static void load_resources(ErlNifEnv* env, ErlNifResourceFlags rt_flags) {
     ErlNifResourceTypeInit rt = {
         NULL /* dtor */,
         tty_select_stop,
@@ -1008,10 +1006,13 @@ static int load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info)
 ATOMS
 #undef ATOM_DECL
 
-    *priv_data = NULL;
-
-    tty_rt = enif_open_resource_type_x(env, "tty", &rt, ERL_NIF_RT_CREATE, NULL);
+    tty_rt = enif_open_resource_type_x(env, "tty", &rt, rt_flags, NULL);
+}
 
+static int load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info)
+{
+    *priv_data = NULL;
+    load_resources(env, ERL_NIF_RT_CREATE);
     return 0;
 }
 
@@ -1029,8 +1030,7 @@ static int upgrade(ErlNifEnv* env, void** priv_data, void** old_priv_data,
     if (*priv_data != NULL) {
 	return -1; /* Don't know how to do that */
     }
-    if (load(env, priv_data, load_info)) {
-	return -1;
-    }
+    *priv_data = NULL;
+    load_resources(env, ERL_NIF_RT_TAKEOVER);
     return 0;
 }
diff --git a/lib/kernel/src/prim_tty.erl b/lib/kernel/src/prim_tty.erl
@@ -119,8 +119,7 @@
 %% proc_lib exports
 -export([reader/1, writer/1]).
 
--export([on_load/0]).
-
+-on_load(on_load/0).
 
 %%-define(debug, true).
 -ifdef(debug).

diff --git a/lib/kernel/src/user_drv.erl b/lib/kernel/src/user_drv.erl
@@ -119,7 +119,6 @@ callback_mode() -> state_functions.
 -spec init(arguments()) -> gen_statem:init_result(init).
 init(Args) ->
     process_flag(trap_exit, true),
-    prim_tty:on_load(),
     IsTTY = prim_tty:isatty(stdin) =:= true andalso prim_tty:isatty(stdout) =:= true,
     StartShell = maps:get(initial_shell, Args, undefined) =/= noshell,
     try