From f8b45e91a37bdfb67ae0224181463e5e914ce721 Mon Sep 17 00:00:00 2001 From: nenolod Date: Tue, 8 May 2007 17:32:08 -0700 Subject: [PATCH] [svn] - fix a bug here --- ChangeLog | 9 +++++++++ include/serno.h | 2 +- libcharybdis/epoll.c | 8 ++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index dce572a..3967173 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +nenolod 2007/05/07 02:57:50 UTC (20070507-3442) + Log: + - regen configure + + + Changes: Modified: + +114 -1 trunk/configure (File Modified) + + nenolod 2007/05/07 02:53:54 UTC (20070507-3440) Log: - remove "ASM hashing code" from the configure overview diff --git a/include/serno.h b/include/serno.h index e14c164..b03706e 100644 --- a/include/serno.h +++ b/include/serno.h @@ -1 +1 @@ -#define SERNO "20070507-3440" +#define SERNO "20070507-3442" diff --git a/libcharybdis/epoll.c b/libcharybdis/epoll.c index 30565a2..5a30ef5 100644 --- a/libcharybdis/epoll.c +++ b/libcharybdis/epoll.c @@ -23,7 +23,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * $Id: epoll.c 3374 2007-04-03 10:49:11Z nenolod $ + * $Id: epoll.c 3444 2007-05-09 00:32:08Z nenolod $ */ #include "config.h" @@ -112,7 +112,9 @@ comm_setselect(int fd, fdlist_t list, unsigned int type, PF * handler, if(timeout) F->timeout = CurrentTime + (timeout / 1000); - if(!(F->pflags & EPOLLIN) && !(F->pflags & EPOLLOUT)) + if(old_flags == 0 && F->pflags == 0) + return; + else if(F->pflags <= 0) op = EPOLL_CTL_DEL; else if(old_flags == 0 && F->pflags > 0) op = EPOLL_CTL_ADD; @@ -131,6 +133,8 @@ comm_setselect(int fd, fdlist_t list, unsigned int type, PF * handler, libcharybdis_log("comm_setselect(): epoll_ctl failed: %s", strerror(errno)); abort(); } + + } /*