diff options
| author | Sverker Eriksson <[email protected]> | 2016-09-23 16:03:55 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-09-23 16:03:55 +0200 |
| commit | f145a56e959fb3b2505dc9f3cf9b7be5ade53125 (patch) | |
| tree | e55bcddd3a0904c731e6126136d0862b84c28d2b /erts/emulator/test/nif_SUITE_data | |
| parent | 7228e3ea97f8e2a19be97740053892e67cc20baf (diff) | |
| parent | a54773f05cd60045a4ac0f9a4ae753aa76185b61 (diff) | |
| download | otp-f145a56e959fb3b2505dc9f3cf9b7be5ade53125.tar.gz otp-f145a56e959fb3b2505dc9f3cf9b7be5ade53125.tar.bz2 otp-f145a56e959fb3b2505dc9f3cf9b7be5ade53125.zip | |
Merge branch 'sverker/remove-nif-reload/OTP-13908'
* sverker/remove-nif-reload:
erts: Cuddle nif_SUITE:consume_timeslice
erts: Remove old doc note for erlang:load_nif
erts: Remove deprecated nif 'reload' feature
erts: Fix trace_nif_SUITE to load nif lib only once
Diffstat (limited to 'erts/emulator/test/nif_SUITE_data')
| -rw-r--r-- | erts/emulator/test/nif_SUITE_data/nif_SUITE.c | 10 | ||||
| -rw-r--r-- | erts/emulator/test/nif_SUITE_data/tester.c | 4 |
2 files changed, 3 insertions, 11 deletions
diff --git a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c index ed142478c6..dc6d8cea76 100644 --- a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c +++ b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c @@ -184,14 +184,6 @@ static void resource_takeover(ErlNifEnv* env, PrivData* priv) msgenv_resource_type = rt; } -static int reload(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info) -{ - PrivData* priv = (PrivData*) *priv_data; - add_call(env, priv, "reload"); - resource_takeover(env,priv); - return 0; -} - static int upgrade(ErlNifEnv* env, void** priv_data, void** old_priv_data, ERL_NIF_TERM load_info) { PrivData* priv = (PrivData*) *old_priv_data; @@ -2094,4 +2086,4 @@ static ErlNifFunc nif_funcs[] = {"format_term_nif", 2, format_term} }; -ERL_NIF_INIT(nif_SUITE,nif_funcs,load,reload,upgrade,unload) +ERL_NIF_INIT(nif_SUITE,nif_funcs,load,NULL,upgrade,unload) diff --git a/erts/emulator/test/nif_SUITE_data/tester.c b/erts/emulator/test/nif_SUITE_data/tester.c index 248c31fd3a..ea4afd924d 100644 --- a/erts/emulator/test/nif_SUITE_data/tester.c +++ b/erts/emulator/test/nif_SUITE_data/tester.c @@ -53,7 +53,7 @@ void testcase_free(void *ptr) void testcase_run(TestCaseState_t *tcs); -static int reload(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info) +static int upgrade(ErlNifEnv* env, void** priv_data, void** old_priv_data, ERL_NIF_TERM load_info) { return 0; } @@ -70,5 +70,5 @@ static ErlNifFunc nif_funcs[] = {"run", 0, run} }; -ERL_NIF_INIT(tester,nif_funcs,NULL,reload,NULL,NULL) +ERL_NIF_INIT(tester,nif_funcs,NULL,NULL,upgrade,NULL) |