1 files changed, 20 insertions, 24 deletions

diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c
index 4fd82bad10..23931f0e54 100644
--- a/erts/emulator/beam/erl_nif.c
+++ b/erts/emulator/beam/erl_nif.c
@@ -769,32 +769,25 @@ enif_port_command(ErlNifEnv *env, const ErlNifPort* to_port,
 
     if (scheduler > 0)
 	prt = erts_port_lookup(to_port->port_id, iflags);
-#ifdef ERTS_DIRTY_SCHEDULERS
-    else if (scheduler < 0) {
+    else {
+#ifdef ERTS_SMP
 	if (ERTS_PROC_IS_EXITING(c_p))
 	    return 0;
 	prt = erts_thr_port_lookup(to_port->port_id, iflags);
-    }
+#else
+        erts_exit(ERTS_ABORT_EXIT,
+		  "enif_port_command: called from non-scheduler "
+                  "thread on non-SMP VM");
 #endif
-    else {
-	erts_exit(ERTS_ABORT_EXIT, "enif_port_command: "
-		  "called from non-scheduler thread");
     }
 
     if (!prt)
 	res = 0;
-    else {
-
-	if (IS_TRACED_FL(prt, F_TRACE_RECEIVE))
-	    trace_port_receive(prt, c_p->common.id, am_command, msg);
-
-	res = erts_port_output_async(prt, c_p->common.id, msg);
-    }
+    else
+        res = erts_port_output_async(prt, c_p->common.id, msg);
 
-#ifdef ERTS_DIRTY_SCHEDULERS
-    if (scheduler < 0)
+    if (scheduler <= 0)
 	erts_port_dec_refc(prt);
-#endif
 
     return res;
 }
@@ -2658,18 +2651,21 @@ done:
 }
 
 int
-enif_is_on_dirty_scheduler(ErlNifEnv* env)
+enif_thread_type(void)
 {
-    int scheduler;
-    Process *c_p;
+    ErtsSchedulerData *esdp = erts_get_scheduler_data();
 
-    execution_state(env, &c_p, &scheduler);
+    if (!esdp)
+	return ERL_NIF_THR_UNDEFINED;
+
+    if (!ERTS_SCHEDULER_IS_DIRTY(esdp))
+	return ERL_NIF_THR_NORMAL_SCHEDULER;
 
-    if (!c_p || !scheduler)
-	erts_exit(ERTS_ABORT_EXIT, "enif_is_on_dirty_scheduler: "
-		  "Invalid env");
+    if (ERTS_SCHEDULER_IS_DIRTY_CPU(esdp))
+	return ERL_NIF_THR_DIRTY_CPU_SCHEDULER;
 
-    return scheduler < 0;
+    ASSERT(ERTS_SCHEDULER_IS_DIRTY_IO(esdp));
+    return ERL_NIF_THR_DIRTY_IO_SCHEDULER;
 }
 
 /* Maps */