diff options
| author | Sverker Eriksson <[email protected]> | 2018-12-06 20:35:59 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-12-20 17:07:48 +0100 |
| commit | 619514492966ba6b7c6e6fee807329c81c8bf7a8 (patch) | |
| tree | 2ce1dd48ddbbea7e769bb530158508bda6d13c57 /erts/emulator/beam | |
| parent | 04c70cafd0ba107e7644462bebcc2db05cc996e4 (diff) | |
| download | otp-619514492966ba6b7c6e6fee807329c81c8bf7a8.tar.gz otp-619514492966ba6b7c6e6fee807329c81c8bf7a8.tar.bz2 otp-619514492966ba6b7c6e6fee807329c81c8bf7a8.zip | |
erts: Add ERL_NIF_SELECT_CUSTOM_MSG
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_drv_nif.h | 3 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_message.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_drv_nif.h b/erts/emulator/beam/erl_drv_nif.h index 9ef7c39d41..a5ecbfff06 100644 --- a/erts/emulator/beam/erl_drv_nif.h +++ b/erts/emulator/beam/erl_drv_nif.h @@ -54,7 +54,8 @@ enum ErlNifSelectFlags { ERL_NIF_SELECT_READ = (1 << 0), ERL_NIF_SELECT_WRITE = (1 << 1), ERL_NIF_SELECT_STOP = (1 << 2), - ERL_NIF_SELECT_CANCEL = (1 << 3) + ERL_NIF_SELECT_CANCEL = (1 << 3), + ERL_NIF_SELECT_CUSTOM_MSG= (1 << 4) }; /* diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c index a3274d7443..942bec84cf 100644 --- a/erts/emulator/beam/erl_message.c +++ b/erts/emulator/beam/erl_message.c @@ -532,9 +532,7 @@ erts_try_alloc_message_on_heap(Process *pp, if ((*psp) & ERTS_PSFLGS_VOLATILE_HEAP) goto in_message_fragment; - else if ( - *plp & ERTS_PROC_LOCK_MAIN - ) { + else if (*plp & ERTS_PROC_LOCK_MAIN) { try_on_heap: if (((*psp) & ERTS_PSFLGS_VOLATILE_HEAP) || (pp->flags & F_DISABLE_GC) |