diff options
| author | Lukas Larsson <[email protected]> | 2019-04-01 11:55:11 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-04-09 14:18:00 +0200 |
| commit | 04c57e50c50d167b65c625d6a9fece8d7b4c7954 (patch) | |
| tree | 1184604d9e990f883130f042ae7fb44c3151521e /erts/emulator/sys/common/erl_check_io.c | |
| parent | 1feae54b6a313f7a35ca1671e3c50f8b434a1bb0 (diff) | |
| download | otp-04c57e50c50d167b65c625d6a9fece8d7b4c7954.tar.gz otp-04c57e50c50d167b65c625d6a9fece8d7b4c7954.tar.bz2 otp-04c57e50c50d167b65c625d6a9fece8d7b4c7954.zip | |
erts: Fix sys_driver to correctly deselect fds
Incorrect precidence rules made the driver never
deselect the given fds.
Diffstat (limited to 'erts/emulator/sys/common/erl_check_io.c')
| -rw-r--r-- | erts/emulator/sys/common/erl_check_io.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/erts/emulator/sys/common/erl_check_io.c b/erts/emulator/sys/common/erl_check_io.c index c39cd01e1c..c77a535105 100644 --- a/erts/emulator/sys/common/erl_check_io.c +++ b/erts/emulator/sys/common/erl_check_io.c @@ -752,6 +752,8 @@ driver_select(ErlDrvPort ix, ErlDrvEvent e, int mode, int on) ret = 0; goto done_unknown; } + /* For some reason (don't know why), we do not clean all + events when doing ERL_DRV_USE_NO_CALLBACK. */ else if ((mode&ERL_DRV_USE_NO_CALLBACK) == ERL_DRV_USE) { mode |= (ERL_DRV_READ | ERL_DRV_WRITE); } @@ -2439,6 +2441,10 @@ drvmode2str(int mode) { case ERL_DRV_WRITE|ERL_DRV_USE: return "WRITE|USE"; case ERL_DRV_READ|ERL_DRV_WRITE|ERL_DRV_USE: return "READ|WRITE|USE"; case ERL_DRV_USE: return "USE"; + case ERL_DRV_READ|ERL_DRV_USE_NO_CALLBACK: return "READ|USE_NO_CB"; + case ERL_DRV_WRITE|ERL_DRV_USE_NO_CALLBACK: return "WRITE|USE_NO_CB"; + case ERL_DRV_READ|ERL_DRV_WRITE|ERL_DRV_USE_NO_CALLBACK: return "READ|WRITE|USE_NO_CB"; + case ERL_DRV_USE_NO_CALLBACK: return "USE_NO_CB"; case ERL_DRV_READ: return "READ"; case ERL_DRV_WRITE: return "WRITE"; case ERL_DRV_READ|ERL_DRV_WRITE: return "READ|WRITE"; |