diff options
| author | Lukas Larsson <[email protected]> | 2018-04-25 09:19:09 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2018-04-25 09:19:09 +0200 |
| commit | 3beffe5b8f9a454b766674427d4eafa22dbdbbd7 (patch) | |
| tree | 9d0573c45ce114b9f7a924ca0d867cc8d7cf7ca6 /erts/emulator | |
| parent | 05d89214dd7614b7f7177a7e4409d39aea6d4491 (diff) | |
| parent | bfb9b3e8ea91aac1afef298c406296069d1b09b4 (diff) | |
| download | otp-3beffe5b8f9a454b766674427d4eafa22dbdbbd7.tar.gz otp-3beffe5b8f9a454b766674427d4eafa22dbdbbd7.tar.bz2 otp-3beffe5b8f9a454b766674427d4eafa22dbdbbd7.zip | |
Merge branch 'lukas/erts/poll-thread/OTP-14346'
* lukas/erts/poll-thread/OTP-14346:
erts: nif resource stop from poll-thread is a indirect call
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/sys/common/erl_check_io.c | 2 | ||||
| -rw-r--r-- | erts/emulator/test/nif_SUITE.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/sys/common/erl_check_io.c b/erts/emulator/sys/common/erl_check_io.c index 6d531fdb76..3e77dce1cd 100644 --- a/erts/emulator/sys/common/erl_check_io.c +++ b/erts/emulator/sys/common/erl_check_io.c @@ -1736,7 +1736,7 @@ erts_check_io(ErtsPollThread *psi) } } if (resource) { - erts_resource_stop(resource, (ErlNifEvent)fd, 1); + erts_resource_stop(resource, (ErlNifEvent)fd, 0); enif_release_resource(resource->data); } if (free_select) diff --git a/erts/emulator/test/nif_SUITE.erl b/erts/emulator/test/nif_SUITE.erl index a9eb4b2768..df521311e3 100644 --- a/erts/emulator/test/nif_SUITE.erl +++ b/erts/emulator/test/nif_SUITE.erl @@ -653,7 +653,7 @@ select_steal(Config) when is_list(Config) -> check_stop_ret(select_nif(RFd, ?ERL_NIF_SELECT_STOP, RFd, null, Ref)), ?assertMatch([{fd_resource_stop, RPtr, _}], flush()), - {1, {RPtr, 1}} = last_fd_stop_call(), + {1, {RPtr, _DirectCall}} = last_fd_stop_call(), ?assert(is_closed_nif(WFd)), |