aboutsummaryrefslogtreecommitdiff
path: root/fdm.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-11-02 22:35:42 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-11-02 22:35:42 +0000
commitba7f79af18ef3713eefc71a52012e255adfbc30e (patch)
treecfa9b3aa32eed1333956bac16bcb41303d7a0cb2 /fdm.c
parentserver: server_destroy(): unlink UNIX socket (diff)
fdm: purge deferred delete list also when handler fails
Diffstat (limited to 'fdm.c')
-rw-r--r--fdm.c13
1 files 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;
}