Committer  : entrope
CVSROOT    : /cvsroot/undernet-ircu
Module     : ircu2.10
Commit time: 2005-03-23 00:25:27 UTC

Modified files:
     ircd/engine_kqueue.c ChangeLog

Log message:

Avoid spurious kqueue() engine warnings.

---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.571 ircu2.10/ChangeLog:1.572
--- ircu2.10/ChangeLog:1.571    Sun Mar 20 08:06:16 2005
+++ ircu2.10/ChangeLog  Tue Mar 22 16:25:16 2005
@@ -1,3 +1,9 @@
+2005-03-22  Michael Poole <[EMAIL PROTECTED]>
+
+       * ircd/engine_kqueue.c (engine_delete): The kernel removes
+       close()'d FDs from the activity list, so don't try to remove the
+       FD here (the caller may have already close()'d it).
+
 2005-03-20  Michael Poole <[EMAIL PROTECTED]>
 
        * ircd/IPcheck.c: Fix typos in comments and strings to reduce
Index: ircu2.10/ircd/engine_kqueue.c
diff -u ircu2.10/ircd/engine_kqueue.c:1.7 ircu2.10/ircd/engine_kqueue.c:1.8
--- ircu2.10/ircd/engine_kqueue.c:1.7   Fri Jan 21 14:52:22 2005
+++ ircu2.10/ircd/engine_kqueue.c       Tue Mar 22 16:25:16 2005
@@ -18,7 +18,7 @@
  */
 /** @file
  * @brief FreeBSD kqueue()/kevent() event engine.
- * @version $Id: engine_kqueue.c,v 1.7 2005/01/21 22:52:22 entrope Exp $
+ * @version $Id: engine_kqueue.c,v 1.8 2005/03/23 00:25:16 entrope Exp $
  */
 #include "config.h"
 
@@ -298,11 +298,6 @@
   dellist[1].data = 0;
   dellist[1].udata = 0;
 
-  /* make it all go away */
-  if (kevent(kqueue_id, dellist, 2, 0, 0, 0) < 0)
-    log_write(LS_SOCKET, L_WARNING, 0,
-             "Unable to delete kevent items for socket %d", s_fd(sock));
-
   sockList[s_fd(sock)] = 0;
 }
 
----------------------- End of diff -----------------------

Reply via email to