From f27c8d32c2f92eb1200ecddd2fbb54ff0fc8edaf Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Mon, 2 May 2016 16:16:45 +0200
Subject: Move dirty nif test cases into dirty_nif_SUITE

---
 erts/emulator/test/nif_SUITE_data/nif_SUITE.c | 123 +-------------------------
 1 file changed, 3 insertions(+), 120 deletions(-)

(limited to 'erts/emulator/test/nif_SUITE_data')

diff --git a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
index 11e5dab58e..73073ad59f 100644
--- a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
+++ b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
@@ -23,6 +23,9 @@
 #include <string.h>
 #include <assert.h>
 #include <limits.h>
+#ifndef __WIN32__
+#include <unistd.h>
+#endif
 
 #include "nif_mod.h"
 
@@ -1574,120 +1577,6 @@ static ERL_NIF_TERM call_nif_schedule(ErlNifEnv* env, int argc, const ERL_NIF_TE
     return result;
 }
 
-#ifdef ERL_NIF_DIRTY_SCHEDULER_SUPPORT
-
-static int have_dirty_schedulers(void)
-{
-    ErlNifSysInfo si;
-    enif_system_info(&si, sizeof(si));
-    return si.dirty_scheduler_support;
-}
-
-static ERL_NIF_TERM dirty_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{
-    int n;
-    char s[10];
-    ErlNifBinary b;
-    ERL_NIF_TERM result;
-    if (have_dirty_schedulers()) {
-	assert(enif_is_on_dirty_scheduler(env));
-    }
-    assert(argc == 3);
-    enif_get_int(env, argv[0], &n);
-    enif_get_string(env, argv[1], s, sizeof s, ERL_NIF_LATIN1);
-    enif_inspect_binary(env, argv[2], &b);
-    return enif_make_tuple3(env,
-			    enif_make_int(env, n),
-			    enif_make_string(env, s, ERL_NIF_LATIN1),
-			    enif_make_binary(env, &b));
-}
-
-static ERL_NIF_TERM call_dirty_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{
-    int n;
-    char s[10];
-    ErlNifBinary b;
-    assert(!enif_is_on_dirty_scheduler(env));
-    if (argc != 3)
-	return enif_make_badarg(env);
-    if (have_dirty_schedulers()) {
-	if (enif_get_int(env, argv[0], &n) &&
-	    enif_get_string(env, argv[1], s, sizeof s, ERL_NIF_LATIN1) &&
-	    enif_inspect_binary(env, argv[2], &b))
-	    return enif_schedule_nif(env, "call_dirty_nif", ERL_NIF_DIRTY_JOB_CPU_BOUND, dirty_nif, argc, argv);
-	else
-	    return enif_make_badarg(env);
-    } else {
-	return dirty_nif(env, argc, argv);
-    }
-}
-
-static ERL_NIF_TERM send_from_dirty_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{
-    ERL_NIF_TERM result;
-    ErlNifPid pid;
-    ErlNifEnv* menv;
-    int res;
-
-    if (!enif_get_local_pid(env, argv[0], &pid))
-	return enif_make_badarg(env);
-    result = enif_make_tuple2(env, enif_make_atom(env, "ok"), enif_make_pid(env, &pid));
-    menv = enif_alloc_env();
-    res = enif_send(env, &pid, menv, result);
-    enif_free_env(menv);
-    if (!res)
-	return enif_make_badarg(env);
-    else
-	return result;
-}
-
-static ERL_NIF_TERM call_dirty_nif_exception(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{
-    switch (argc) {
-    case 1: {
-	int arg;
-	if (enif_get_int(env, argv[0], &arg) && arg < 2) {
-	    ERL_NIF_TERM args[255];
-	    int i;
-	    args[0] = argv[0];
-	    for (i = 1; i < 255; i++)
-		args[i] = enif_make_int(env, i);
-	    return enif_schedule_nif(env, "call_dirty_nif_exception", ERL_NIF_DIRTY_JOB_CPU_BOUND,
-				     call_dirty_nif_exception, 255, args);
-	} else {
-	    return enif_raise_exception(env, argv[0]);
-	}
-    }
-    case 2: {
-        int return_badarg_directly;
-        enif_get_int(env, argv[0], &return_badarg_directly);
-        assert(return_badarg_directly == 1 || return_badarg_directly == 0);
-        if (return_badarg_directly)
-            return enif_make_badarg(env);
-        else {
-            /* ignore return value */ enif_make_badarg(env);
-            return enif_make_atom(env, "ok");
-        }
-    }
-    default:
-	return enif_schedule_nif(env, "call_dirty_nif_exception", ERL_NIF_DIRTY_JOB_CPU_BOUND,
-				 call_dirty_nif_exception, argc-1, argv);
-    }
-}
-
-static ERL_NIF_TERM call_dirty_nif_zero_args(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{
-    int i;
-    ERL_NIF_TERM result[1000];
-    ERL_NIF_TERM ok = enif_make_atom(env, "ok");
-    assert(argc == 0);
-    for (i = 0; i < sizeof(result)/sizeof(*result); i++) {
-	result[i] = ok;
-    }
-    return enif_make_list_from_array(env, result, i);
-}
-#endif
-
 /*
  * If argv[0] is the integer 0, call enif_make_badarg, but don't return its
  * return value. Instead, return ok.  Result should still be a badarg
@@ -2162,12 +2051,6 @@ static ErlNifFunc nif_funcs[] =
     {"otp_9828_nif", 1, otp_9828_nif},
     {"consume_timeslice_nif", 2, consume_timeslice_nif},
     {"call_nif_schedule", 2, call_nif_schedule},
-#ifdef ERL_NIF_DIRTY_SCHEDULER_SUPPORT
-    {"call_dirty_nif", 3, call_dirty_nif},
-    {"send_from_dirty_nif", 1, send_from_dirty_nif, ERL_NIF_DIRTY_JOB_CPU_BOUND},
-    {"call_dirty_nif_exception", 1, call_dirty_nif_exception, ERL_NIF_DIRTY_JOB_IO_BOUND},
-    {"call_dirty_nif_zero_args", 0, call_dirty_nif_zero_args, ERL_NIF_DIRTY_JOB_CPU_BOUND},
-#endif
     {"call_nif_exception", 1, call_nif_exception},
     {"call_nif_nan_or_inf", 1, call_nif_nan_or_inf},
     {"call_nif_atom_too_long", 1, call_nif_atom_too_long},
-- 
cgit v1.2.3