aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test/nif_SUITE_data
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-04-15 14:50:39 +0200
committerLukas Larsson <[email protected]>2016-04-15 14:50:39 +0200
commit67df3b3792857a2b4885c0acbeaa7f32f3594b0c (patch)
tree57b7749d36fa3b60560cbfcf9a196006de10af95 /erts/emulator/test/nif_SUITE_data
parent8d2ea920456c5db3f123ebc19b8b8e398db2e2d5 (diff)
parent57551877d85ad7659201235e27498be42809fefb (diff)
downloadotp-67df3b3792857a2b4885c0acbeaa7f32f3594b0c.tar.gz
otp-67df3b3792857a2b4885c0acbeaa7f32f3594b0c.tar.bz2
otp-67df3b3792857a2b4885c0acbeaa7f32f3594b0c.zip
Merge branch 'lukas/erts/enif_send_null_env/OTP-13495'
* lukas/erts/enif_send_null_env/OTP-13495: erts: Add enif_send with NULL as msg env
Diffstat (limited to 'erts/emulator/test/nif_SUITE_data')
-rw-r--r--erts/emulator/test/nif_SUITE_data/nif_SUITE.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
index 2b68c38008..11e5dab58e 100644
--- a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
+++ b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
@@ -1466,6 +1466,18 @@ static ERL_NIF_TERM send_term(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[
return enif_make_int(env, ret);
}
+static ERL_NIF_TERM send_copy_term(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+ ErlNifEnv* menv;
+ ErlNifPid pid;
+ int ret;
+ if (!enif_get_local_pid(env, argv[0], &pid)) {
+ return enif_make_badarg(env);
+ }
+ ret = enif_send(env, &pid, NULL, argv[1]);
+ return enif_make_int(env, ret);
+}
+
static ERL_NIF_TERM reverse_list(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) {
ERL_NIF_TERM rev_list;
@@ -2142,6 +2154,7 @@ static ErlNifFunc nif_funcs[] =
{"join_send_thread", 1, join_send_thread},
{"copy_blob", 1, copy_blob},
{"send_term", 2, send_term},
+ {"send_copy_term", 2, send_copy_term},
{"reverse_list",1, reverse_list},
{"echo_int", 1, echo_int},
{"type_sizes", 0, type_sizes},