1 files changed, 81 insertions, 33 deletions

diff --git a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
index c8cd323b7e..17f644829f 100644
--- a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
+++ b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
@@ -1038,36 +1038,41 @@ static ERL_NIF_TERM make_term_copy(struct make_term_info* mti, int n)
 {
     return enif_make_copy(mti->dst_env, mti->other_term);
 }
+
+typedef ERL_NIF_TERM Make_term_Func(struct make_term_info*, int);
+static Make_term_Func* make_funcs[] = {
+    make_term_binary,
+    make_term_int,
+    make_term_ulong,
+    make_term_double,
+    make_term_atom,
+    make_term_existing_atom,
+    make_term_string,
+    //make_term_ref,
+    make_term_sub_binary,
+    make_term_uint,
+    make_term_long,
+    make_term_tuple0,
+    make_term_list0,
+    make_term_resource,
+    make_term_new_binary,
+    make_term_caller_pid,
+    make_term_tuple,
+    make_term_list,
+    make_term_list_cell,
+    make_term_tuple_from_array,
+    make_term_list_from_array,
+    make_term_garbage,
+    make_term_copy
+};
+static unsigned num_of_make_funcs()
+{
+    return sizeof(make_funcs)/sizeof(*make_funcs);
+}
 static int make_term_n(struct make_term_info* mti, int n, ERL_NIF_TERM* res)
 {
-    typedef ERL_NIF_TERM Make_term_Func(struct make_term_info*, int);
-    static Make_term_Func* funcs[] = {
-	make_term_binary,
-	make_term_int,
-	make_term_ulong,
-	make_term_double,
-	make_term_atom,
-	make_term_existing_atom,
-	make_term_string,
-	//make_term_ref,
-	make_term_sub_binary,
-	make_term_uint,
-	make_term_long,
-	make_term_tuple0,
-	make_term_list0,
-	make_term_resource,
-	make_term_new_binary,
-	make_term_caller_pid,
-	make_term_tuple,
-	make_term_list,
-	make_term_list_cell,
-	make_term_tuple_from_array,
-	make_term_list_from_array,
-	make_term_garbage,
-	make_term_copy
-    };
-    if (n < sizeof(funcs)/sizeof(*funcs)) {
-	*res = funcs[n](mti, n);
+    if (n < num_of_make_funcs()) {
+	*res = make_funcs[n](mti, n);
 	push_term(mti, *res);
 	return 1;
     }
@@ -1167,14 +1172,14 @@ static ERL_NIF_TERM grow_blob(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[
 {
     union { void* vp; struct make_term_info* p; }mti;
     ERL_NIF_TERM term;
-    if (!enif_get_resource(env, argv[0], msgenv_resource_type, &mti.vp)) {
+    if (!enif_get_resource(env, argv[0], msgenv_resource_type, &mti.vp)
+	|| (argc>2 && !enif_get_uint(env,argv[2], &mti.p->n))) {
 	return enif_make_badarg(env);
     }
     mti.p->caller_env = env;
     mti.p->other_term = argv[1];
-    while (!make_term_n(mti.p, mti.p->n++, &term)) {
-	mti.p->n = 0;
-    }
+    mti.p->n %= num_of_make_funcs();
+    make_term_n(mti.p, mti.p->n++, &term);
     mti.p->blob = enif_make_list_cell(mti.p->dst_env, term, mti.p->blob);
     return atom_ok;
 }
@@ -1194,6 +1199,23 @@ static ERL_NIF_TERM send_blob(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[
     return enif_make_tuple3(env, atom_ok, enif_make_int(env,res), copy);
 }
 
+static ERL_NIF_TERM send3_blob(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    union { void* vp; struct make_term_info* p; }mti;
+    ErlNifPid to;
+    ERL_NIF_TERM copy;
+    int res;
+    if (!enif_get_resource(env, argv[0], msgenv_resource_type, &mti.vp)
+	|| !enif_get_local_pid(env, argv[1], &to)) {
+	return enif_make_badarg(env);
+    }
+    mti.p->blob = enif_make_tuple2(mti.p->dst_env, 
+				   enif_make_copy(mti.p->dst_env, argv[2]),
+				   mti.p->blob);
+    res = enif_send(env, &to, mti.p->dst_env, mti.p->blob);
+    return enif_make_int(env,res);
+}
+
 void* threaded_sender(void *arg)
 {
 
@@ -1253,6 +1275,28 @@ static ERL_NIF_TERM join_send_thread(ErlNifEnv* env, int argc, const ERL_NIF_TER
     return enif_make_tuple2(env, atom_ok, enif_make_int(env, mti.p->send_res));    
 }
 
+static ERL_NIF_TERM copy_blob(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    union { void* vp; struct make_term_info* p; }mti;
+    if (!enif_get_resource(env, argv[0], msgenv_resource_type, &mti.vp)) {
+	return enif_make_badarg(env);
+    }
+    return enif_make_copy(env, mti.p->blob);
+}
+
+static ERL_NIF_TERM send_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);
+    }
+    menv = enif_alloc_env();
+    ret = enif_send(env, &pid, menv, enif_make_copy(menv, argv[1]));
+    enif_free_env(menv);
+    return enif_make_int(env, ret);
+}
 
 static ErlNifFunc nif_funcs[] =
 {
@@ -1291,9 +1335,13 @@ static ErlNifFunc nif_funcs[] =
     {"alloc_msgenv", 0, alloc_msgenv},
     {"clear_msgenv", 1, clear_msgenv},
     {"grow_blob", 2, grow_blob},
+    {"grow_blob", 3, grow_blob},
     {"send_blob", 2, send_blob},
+    {"send3_blob", 3, send3_blob},
     {"send_blob_thread", 3, send_blob_thread},
-    {"join_send_thread", 1, join_send_thread}
+    {"join_send_thread", 1, join_send_thread},
+    {"copy_blob", 1, copy_blob},
+    {"send_term", 2, send_term}
 };
 
 ERL_NIF_INIT(nif_SUITE,nif_funcs,load,reload,upgrade,unload)