diff options
| author | Lukas Larsson <[email protected]> | 2018-08-15 11:52:59 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-08-15 11:52:59 +0200 |
| commit | 3921cb5ff5ae28c18374f937de12ac86f330bc9d (patch) | |
| tree | 22ab6cabb12475f4aa688d6c3585789447f7040f /erts/emulator | |
| parent | b20087d24c30331ceb314650a4128c6345e11f61 (diff) | |
| parent | 1d1f29eb614ce75012f9136d185f4dbcccc8650b (diff) | |
| download | otp-3921cb5ff5ae28c18374f937de12ac86f330bc9d.tar.gz otp-3921cb5ff5ae28c18374f937de12ac86f330bc9d.tar.bz2 otp-3921cb5ff5ae28c18374f937de12ac86f330bc9d.zip | |
merge branch 'lukas/erts/fd_driver-fix_pollset_delete/ERL-692/OTP-15236' into maint
erts: Delete fd from poll-set when closing fd_driver port
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/sys/unix/sys_drivers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/sys/unix/sys_drivers.c b/erts/emulator/sys/unix/sys_drivers.c index d0498f0bd5..816bdea9c5 100644 --- a/erts/emulator/sys/unix/sys_drivers.c +++ b/erts/emulator/sys/unix/sys_drivers.c @@ -1000,7 +1000,7 @@ static void clear_fd_data(ErtsSysFdData *fdd) static void nbio_stop_fd(ErlDrvPort prt, ErtsSysFdData *fdd) { - driver_select(prt, abs(fdd->fd), DO_READ|DO_WRITE, 0); + driver_select(prt, abs(fdd->fd), ERL_DRV_USE_NO_CALLBACK|DO_READ|DO_WRITE, 0); clear_fd_data(fdd); SET_BLOCKING(abs(fdd->fd)); |