aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test/trace_call_time_SUITE_data
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-09-19 14:34:57 +0200
committerSverker Eriksson <[email protected]>2016-09-19 14:34:57 +0200
commit4f8071d81aa0690caa3adc734d73a1cb004ad808 (patch)
tree43891bce5cabd0baad365835b621971b2bc27940 /erts/emulator/test/trace_call_time_SUITE_data
parent7262d8630998517e97ec62a7e0d9cbdd23fdd9c8 (diff)
downloadotp-4f8071d81aa0690caa3adc734d73a1cb004ad808.tar.gz
otp-4f8071d81aa0690caa3adc734d73a1cb004ad808.tar.bz2
otp-4f8071d81aa0690caa3adc734d73a1cb004ad808.zip
erts: Remove deprecated nif 'reload' feature
and instead let erlang:load_nif/2 return {error, {reload, _}} before even trying to load the library if a NIF library has already been successfully loaded for the calling module instance.
Diffstat (limited to 'erts/emulator/test/trace_call_time_SUITE_data')
-rw-r--r--erts/emulator/test/trace_call_time_SUITE_data/trace_nif.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/erts/emulator/test/trace_call_time_SUITE_data/trace_nif.c b/erts/emulator/test/trace_call_time_SUITE_data/trace_nif.c
index 33b346aab7..0540c25cb9 100644
--- a/erts/emulator/test/trace_call_time_SUITE_data/trace_nif.c
+++ b/erts/emulator/test/trace_call_time_SUITE_data/trace_nif.c
@@ -6,11 +6,6 @@ static int load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info)
return 0;
}
-static int reload(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info)
-{
- return 0;
-}
-
static int upgrade(ErlNifEnv* env, void** priv_data, void** old_priv_data, ERL_NIF_TERM load_info)
{
return 0;
@@ -34,4 +29,4 @@ static ErlNifFunc nif_funcs[] =
{"nif_dec", 1, nif_dec_1}
};
-ERL_NIF_INIT(trace_call_time_SUITE,nif_funcs,load,reload,upgrade,unload)
+ERL_NIF_INIT(trace_call_time_SUITE,nif_funcs,load,NULL,upgrade,unload)