Fix the epoll poller

Setting the fd to -1 broke poller_remove_from_dispatch().
This commit is contained in:
2014-09-24 19:03:45 +02:00
parent 89edba14f0
commit 21cab71e75
2 changed files with 3 additions and 2 deletions

View File

@@ -873,6 +873,7 @@ struct poller_fd
int fd; ///< Our file descriptor
short events; ///< The poll() events we registered for
bool closed; ///< Whether fd has been closed already
poller_fd_fn dispatcher; ///< Event dispatcher
void *user_data; ///< User data
@@ -1194,7 +1195,7 @@ poller_remove_at_index (struct poller *self, size_t index)
fd->index = -1;
poller_remove_from_dispatch (self, fd);
if (fd->fd != -1)
if (!fd->closed)
hard_assert (epoll_ctl (self->epoll_fd,
EPOLL_CTL_DEL, fd->fd, (void *) "") != -1);