cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

We need to do that in another spot. Yuck.

This commit is contained in:
William Pitcock 2007-12-20 16:59:52 -06:00
parent d60ba3dabf
commit 201f4ef72f
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libcharybdis/epoll.c
View File

@ -180,8 +180,25 @@ comm_select(unsigned long delay)
} }
if(F->flags.open == 0) if(F->flags.open == 0 && F->pflags == 0)
continue; continue;
else if (F->flags.open == 0)
{
F->pflags = ep_event.events = flags;
ep_event.data.ptr = F;
if(epoll_ctl(ep, EPOLL_CTL_DEL, F->fd, &ep_event) != 0) {
/* XXX: we assume this is because close(2) has been called here. */
if (errno == EBADF)
continue;
libcharybdis_log("comm_select(): epoll_ctl failed while trying to delete an FD marked as closed: %s", strerror(errno));
abort();
}
continue;
}
if(pfd[i].events & (EPOLLOUT | EPOLLHUP | EPOLLERR)) if(pfd[i].events & (EPOLLOUT | EPOLLHUP | EPOLLERR))
{ {
hdl = F->write_handler; hdl = F->write_handler;
@ -211,6 +228,8 @@ comm_select(unsigned long delay)
libcharybdis_log("comm_select(): epoll_ctl failed while trying to delete an FD marked as closed: %s", strerror(errno)); libcharybdis_log("comm_select(): epoll_ctl failed while trying to delete an FD marked as closed: %s", strerror(errno));
abort(); abort();
} }
continue;
} }
flags = 0; flags = 0;