aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-04-24 08:42:25 +0200
committerLukas Larsson <[email protected]>2018-04-24 09:49:30 +0200
commitbfb9b3e8ea91aac1afef298c406296069d1b09b4 (patch)
tree5eaed43c5c0b920b35d973131cd566074b07aba5 /erts
parent44681c2ff6347d7e77195cdec0bccc95ee245855 (diff)
downloadotp-bfb9b3e8ea91aac1afef298c406296069d1b09b4.tar.gz
otp-bfb9b3e8ea91aac1afef298c406296069d1b09b4.tar.bz2
otp-bfb9b3e8ea91aac1afef298c406296069d1b09b4.zip
erts: nif resource stop from poll-thread is a indirect call
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/sys/common/erl_check_io.c2
-rw-r--r--erts/emulator/test/nif_SUITE.erl2
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 f93d4c1557..8928529984 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 bec2291867..e259e39c86 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)),