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/trace_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/trace_nif_SUITE_data')
| -rw-r--r-- | erts/emulator/test/trace_nif_SUITE_data/trace_nif.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/erts/emulator/test/trace_nif_SUITE_data/trace_nif.c b/erts/emulator/test/trace_nif_SUITE_data/trace_nif.c index fe9308bf4e..1afb5ee919 100644 --- a/erts/emulator/test/trace_nif_SUITE_data/trace_nif.c +++ b/erts/emulator/test/trace_nif_SUITE_data/trace_nif.c @@ -6,18 +6,18 @@ 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) +static int upgrade(ErlNifEnv* env, void** priv_data, void** old_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) +static void unload(ErlNifEnv* env, void* priv_data) { - return 0; } -static void unload(ErlNifEnv* env, void* priv_data) +static ERL_NIF_TERM is_nif_loaded(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { + return enif_make_atom(env,"true"); } static ERL_NIF_TERM nif_0(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) @@ -38,9 +38,10 @@ static ERL_NIF_TERM nif_1(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) static ErlNifFunc nif_funcs[] = { + {"is_nif_loaded", 0, is_nif_loaded}, {"nif", 0, nif_0}, {"nif", 1, nif_1} }; -ERL_NIF_INIT(trace_nif_SUITE,nif_funcs,load,reload,upgrade,unload) +ERL_NIF_INIT(trace_nif_SUITE,nif_funcs,load,NULL,upgrade,unload) |