use io_close instead of plain close in Conn_ExitListeners()

[ngircd-alex.git] / src / ngircd / io.c

diff --git a/src/ngircd/io.c b/src/ngircd/io.c
index 3782cd3c7680af8c704529e999d25c4f45c8e8af..5c8d8c8fe5e564d9938950782e7d9c80dd3e4298 100644 (file)
--- a/src/ngircd/io.c
+++ b/src/ngircd/io.c
@@ -12,7 +12,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: io.c,v 1.7 2005/08/27 20:27:07 fw Exp $";
+static char UNUSED id[] = "$Id: io.c,v 1.11 2005/09/04 13:38:59 fw Exp $";
 
 #include <assert.h>
 #include <stdlib.h>
@@ -298,7 +298,7 @@ io_event_add_kqueue(int fd, short what)
 {
        struct kevent kev;
        short filter = 0;
-       unsigned int len = array_length(&io_evcache, sizeof kev);
+       size_t len = array_length(&io_evcache, sizeof kev);
 
        if (what & IO_WANTREAD)
                filter = EVFILT_READ;
@@ -307,7 +307,7 @@ io_event_add_kqueue(int fd, short what)
                filter |= EVFILT_WRITE;
 
        if (len >= 100) {
-               (void)array_trunc(&io_evcache);
+               (void)io_event_kqueue_commit_cache();
        }
 
        EV_SET(&kev, fd, filter, EV_ADD | EV_ENABLE, 0, 0, NULL);
@@ -390,7 +390,10 @@ io_close(int fd)
        if (array_length(&io_evcache, sizeof (struct kevent)))  /* pending data in cache? */
                io_event_kqueue_commit_cache();
 #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 */
 }
 
 
@@ -521,7 +524,7 @@ io_dispatch_kqueue(struct timeval *tv)
 {
        int i, total = 0, ret;
        struct kevent kev[100];
-       const struct kevent *newevents;
+       struct kevent *newevents;
        struct timespec ts;
        int newevents_len;
        short type;
@@ -529,7 +532,7 @@ io_dispatch_kqueue(struct timeval *tv)
        ts.tv_nsec = tv->tv_usec * 1000;
        
        do {
-               newevents_len = array_length(&io_evcache, sizeof (struct kevent));
+               newevents_len = (int) array_length(&io_evcache, sizeof (struct kevent));
                newevents = (newevents_len > 0) ? array_start(&io_evcache) : NULL;
                assert(newevents_len >= 0);
                if (newevents_len < 0)