From 7e3ccd956de5825dbb62295506656768e8a141bf Mon Sep 17 00:00:00 2001 From: brain Date: Fri, 6 Oct 2006 21:45:27 +0000 Subject: Revert tweak git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5443 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/socketengine_epoll.cpp | 6 +++--- src/socketengine_kqueue.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/socketengine_epoll.cpp b/src/socketengine_epoll.cpp index 7d35997c5..63b1fc10d 100644 --- a/src/socketengine_epoll.cpp +++ b/src/socketengine_epoll.cpp @@ -91,15 +91,15 @@ bool EPollEngine::DelFd(EventHandler* eh) ev.data.fd = fd; int i = epoll_ctl(EngineHandle, EPOLL_CTL_DEL, fd, &ev); - CurrentSetSize--; - ref[fd] = NULL; - if (i < 0) { ServerInstance->Log(DEBUG,"epoll: List deletion failure: %s",strerror(errno)); return false; } + CurrentSetSize--; + ref[fd] = NULL; + return true; } diff --git a/src/socketengine_kqueue.cpp b/src/socketengine_kqueue.cpp index 15d0e30bc..ef5c507a1 100644 --- a/src/socketengine_kqueue.cpp +++ b/src/socketengine_kqueue.cpp @@ -94,9 +94,6 @@ bool KQueueEngine::DelFd(EventHandler* eh) struct kevent ke; EV_SET(&ke, fd, eh->Readable() ? EVFILT_READ : EVFILT_WRITE, EV_DELETE, 0, 0, NULL); - CurrentSetSize--; - ref[fd] = NULL; - int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL); if (i == -1) { @@ -104,6 +101,9 @@ bool KQueueEngine::DelFd(EventHandler* eh) return false; } + CurrentSetSize--; + ref[fd] = NULL; + return true; } -- cgit v1.2.3