From 7ff8a74945c0cb525a2d197e28426fd098a407cf Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 22 Sep 2016 02:53:46 +0300 Subject: [PATCH] os: Clear saved poll events in listen so that edge triggering works When a client is marked as write blocked, clear any old 'write ready' bit in the osfds structure so that a new indication of write ready (which is marked as edge trigggered) will trigger the callback. Signed-off-by: Keith Packard Reviewed-by: Jeremy Huddleston Sequoia Tested-by: Jeremy Huddleston Sequoia Tested-by: Matthieu Herrb --- os/ospoll.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/os/ospoll.c b/os/ospoll.c index b00d42202..51bd02dc7 100644 --- a/os/ospoll.c +++ b/os/ospoll.c @@ -352,10 +352,14 @@ ospoll_listen(struct ospoll *ospoll, int fd, int xevents) epoll_mod(ospoll, osfd); #endif #if POLL - if (xevents & X_NOTIFY_READ) + if (xevents & X_NOTIFY_READ) { ospoll->fds[pos].events |= POLLIN; - if (xevents & X_NOTIFY_WRITE) + ospoll->osfds[pos].revents &= ~POLLIN; + } + if (xevents & X_NOTIFY_WRITE) { ospoll->fds[pos].events |= POLLOUT; + ospoll->osfds[pos].revents &= ~POLLOUT; + } #endif } }