From 56cec38f3e7d3447b40076481c15e6d4a7e278d0 Mon Sep 17 00:00:00 2001 From: brain Date: Fri, 18 Aug 2006 10:07:22 +0000 Subject: Get rid of SocketEngine::Wait and array-copy, change to SocketEngine::DispatchEvents git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4944 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/socketengine_epoll.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/socketengine_epoll.cpp') diff --git a/src/socketengine_epoll.cpp b/src/socketengine_epoll.cpp index 9057c6d65..be46451fa 100644 --- a/src/socketengine_epoll.cpp +++ b/src/socketengine_epoll.cpp @@ -111,15 +111,16 @@ int EPollEngine::GetRemainingFds() return MAX_DESCRIPTORS - CurrentSetSize; } -int EPollEngine::Wait(EventHandler** fdlist) +int EPollEngine::DispatchEvents() { - int result = 0; - int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 50); for (int j = 0; j < i; j++) - fdlist[result++] = ref[events[j].data.fd]; + { + ServerInstance->Log(DEBUG,"Handle %s event on fd %d",ref[events[j].data.fd]->Readable() ? "read" : "write", ref[events[j].data.fd]->GetFd()); + ref[events[j].data.fd]->HandleEvent(ref[events[j].data.fd]->Readable() ? EVENT_READ : EVENT_WRITE); + } - return result; + return i; } std::string EPollEngine::GetName() -- cgit v1.2.3