diff options
| author | Sverker Eriksson <[email protected]> | 2019-02-11 14:39:46 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2019-02-11 14:39:46 +0100 |
| commit | 2b8a46f154fb411c47262eb1c439a912d1fc8fd5 (patch) | |
| tree | 6fe1ac4c6a5d2624a364aea9ba6068cb787c0e0e /erts/emulator/beam/erl_nif.c | |
| parent | 0a72d1714f7d7f447a78433451c39c75da6ae103 (diff) | |
| parent | 3f5c2b86b7dcd1d8b5a2eacad92b659ac9709a53 (diff) | |
| download | otp-2b8a46f154fb411c47262eb1c439a912d1fc8fd5.tar.gz otp-2b8a46f154fb411c47262eb1c439a912d1fc8fd5.tar.bz2 otp-2b8a46f154fb411c47262eb1c439a912d1fc8fd5.zip | |
Merge branch 'sverker/enif_select-faulty-assert' into maint
* sverker/enif_select-faulty-assert:
erts: Fix faulty debug assert in enif_select
Diffstat (limited to 'erts/emulator/beam/erl_nif.c')
| -rw-r--r-- | erts/emulator/beam/erl_nif.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c index ee6e6085b6..17041cc91c 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -2354,6 +2354,13 @@ static void dtor_demonitor(ErtsMonitor* mon, void* context) erts_proc_sig_send_demonitor(mon); } +#ifdef DEBUG +int erts_dbg_is_resource_dying(ErtsResource* resource) +{ + return resource->monitors && rmon_is_dying(resource->monitors); +} +#endif + # define NIF_RESOURCE_DTOR &nif_resource_dtor static int nif_resource_dtor(Binary* bin) |