aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/beam_emu.c
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2014-08-28 21:30:44 +0200
committerRickard Green <[email protected]>2014-08-28 21:30:44 +0200
commite59ea3efb5eafcda94fec0f838f2062db47acbcd (patch)
treee86f4e1a66a18194446a294b2fe3caae1de33b02 /erts/emulator/beam/beam_emu.c
parent13758c27667f2a8859796baf0a19ca4d759390d5 (diff)
parentfeb45017da36be78d4c5784d758ede619fa7bfd3 (diff)
downloadotp-e59ea3efb5eafcda94fec0f838f2062db47acbcd.tar.gz
otp-e59ea3efb5eafcda94fec0f838f2062db47acbcd.tar.bz2
otp-e59ea3efb5eafcda94fec0f838f2062db47acbcd.zip
Merge branch 'maint'
* maint: add enif_schedule_nif() to NIF API
Diffstat (limited to 'erts/emulator/beam/beam_emu.c')
-rw-r--r--erts/emulator/beam/beam_emu.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index 9b251a6ad1..1096c2c8c8 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -3503,6 +3503,7 @@ get_map_elements_fail:
* I[0]: &&call_nif
* I[1]: Function pointer to NIF function
* I[2]: Pointer to erl_module_nif
+ * I[3]: Function pointer to dirty NIF
*/
BifFunction vbf;
@@ -3523,13 +3524,6 @@ get_map_elements_fail:
reg[0] = r(0);
nif_bif_result = (*fp)(&env, bif_nif_arity, reg);
erts_post_nif(&env);
-#ifdef ERTS_DIRTY_SCHEDULERS
- if (is_non_value(nif_bif_result) && c_p->freason == TRAP) {
- Export* ep = ERTS_PROC_GET_DIRTY_SCHED_TRAP_EXPORT(c_p);
- ep->code[0] = I[-3];
- ep->code[1] = I[-2];
- }
-#endif
}
ASSERT(!ERTS_PROC_IS_EXITING(c_p) || is_non_value(nif_bif_result));
PROCESS_MAIN_CHK_LOCKS(c_p);