From ba7f79af18ef3713eefc71a52012e255adfbc30e Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sat, 2 Nov 2019 23:35:42 +0100 Subject: fdm: purge deferred delete list also when handler fails --- fdm.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/fdm.c b/fdm.c index c7af68d0..dbe8d209 100644 --- a/fdm.c +++ b/fdm.c @@ -149,8 +149,9 @@ fdm_poll(struct fdm *fdm) } struct epoll_event events[tll_length(fdm->fds)]; - int ret = epoll_wait(fdm->epoll_fd, events, tll_length(fdm->fds), -1); - if (ret == -1) { + + int r = epoll_wait(fdm->epoll_fd, events, tll_length(fdm->fds), -1); + if (r == -1) { if (errno == EINTR) return true; @@ -158,6 +159,8 @@ fdm_poll(struct fdm *fdm) return false; } + bool ret = true; + fdm->is_polling = true; for (int i = 0; i < ret; i++) { struct fd *fd = events[i].data.ptr; @@ -165,8 +168,8 @@ fdm_poll(struct fdm *fdm) continue; if (!fd->handler(fdm, fd->fd, events[i].events, fd->data)) { - fdm->is_polling = false; - return false; + ret = false; + break; } } fdm->is_polling = false; @@ -176,5 +179,5 @@ fdm_poll(struct fdm *fdm) tll_remove(fdm->deferred_delete, it); } - return true; + return ret; } -- cgit v1.3