albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

io_close(): explicitly remove fd from epoll set

This commit is contained in:
Florian Westphal 2005-09-04 13:38:59 +00:00
parent b2a3bc3257
commit 565129f992
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ngircd/io.c
View File

@ -12,7 +12,7 @@
#include "portab.h" #include "portab.h"
static char UNUSED id[] = "$Id: io.c,v 1.10 2005/08/30 13:38:16 fw Exp $"; static char UNUSED id[] = "$Id: io.c,v 1.11 2005/09/04 13:38:59 fw Exp $";
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
@ -390,7 +390,10 @@ io_close(int fd)
if (array_length(&io_evcache, sizeof (struct kevent))) /* pending data in cache? */ if (array_length(&io_evcache, sizeof (struct kevent))) /* pending data in cache? */
io_event_kqueue_commit_cache(); io_event_kqueue_commit_cache();
#endif #endif
return close(fd) == 0; /* both epoll an kqueue will remove fd from all sets automatically */ #ifdef IO_USE_EPOLL
epoll_ctl(io_masterfd, EPOLL_CTL_DEL, fd, NULL);
#endif
return close(fd) == 0; /* kqueue will remove fd from all sets automatically */
} }