From f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f Mon Sep 17 00:00:00 2001 From: peavey Date: Mon, 16 Jul 2007 17:30:04 +0000 Subject: OOPS! We try again, since I'm smoking craq. LF is 0x0a NOT CR. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7456 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/socketengine_select.cpp | 168 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 167 insertions(+), 1 deletion(-) (limited to 'src/socketengine_select.cpp') diff --git a/src/socketengine_select.cpp b/src/socketengine_select.cpp index 73e909193..ef5f2071f 100644 --- a/src/socketengine_select.cpp +++ b/src/socketengine_select.cpp @@ -1 +1,167 @@ -/* +------------------------------------+ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * * InspIRCd: (C) 2002-2007 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ #include "inspircd.h" #include #include "socketengine_select.h" SelectEngine::SelectEngine(InspIRCd* Instance) : SocketEngine(Instance) { EngineHandle = 0; CurrentSetSize = 0; memset(writeable, 0, sizeof(writeable)); } SelectEngine::~SelectEngine() { } bool SelectEngine::AddFd(EventHandler* eh) { int fd = eh->GetFd(); if ((fd < 0) || (fd > MAX_DESCRIPTORS)) return false; if (GetRemainingFds() <= 1) return false; fds[fd] = fd; if (ref[fd]) return false; ref[fd] = eh; CurrentSetSize++; ServerInstance->Log(DEBUG,"New file descriptor: %d", fd); return true; } void SelectEngine::WantWrite(EventHandler* eh) { writeable[eh->GetFd()] = true; } bool SelectEngine::DelFd(EventHandler* eh, bool force) { int fd = eh->GetFd(); if ((fd < 0) || (fd > MAX_DESCRIPTORS)) return false; std::map::iterator t = fds.find(fd); if (t != fds.end()) fds.erase(t); CurrentSetSize--; ref[fd] = NULL; ServerInstance->Log(DEBUG,"Remove file descriptor: %d", fd); return true; } int SelectEngine::GetMaxFds() { return FD_SETSIZE; } int SelectEngine::GetRemainingFds() { return FD_SETSIZE - CurrentSetSize; } int SelectEngine::DispatchEvents() { int result = 0; timeval tval; int sresult = 0; EventHandler* ev[MAX_DESCRIPTORS]; socklen_t codesize; int errcode; FD_ZERO(&wfdset); FD_ZERO(&rfdset); FD_ZERO(&errfdset); for (std::map::iterator a = fds.begin(); a != fds.end(); a++) { if (ref[a->second]->Readable()) FD_SET (a->second, &rfdset); else FD_SET (a->second, &wfdset); if (writeable[a->second]) FD_SET (a->second, &wfdset); FD_SET (a->second, &errfdset); } tval.tv_sec = 1; tval.tv_usec = 0; sresult = select(FD_SETSIZE, &rfdset, &wfdset, &errfdset, &tval); if (sresult > 0) { for (std::map::iterator a = fds.begin(); a != fds.end(); a++) { if ((FD_ISSET (a->second, &rfdset)) || (FD_ISSET (a->second, &wfdset)) || FD_ISSET (a->second, &errfdset)) { ev[result++] = ref[a->second]; } } } /** An event handler may remove its own descriptor from the list, therefore it is not * safe to directly iterate over the list and dispatch events there with STL iterators. * Thats a shame because it makes this code slower and more resource intensive, but maybe * the user should stop using select(), as select() smells anyway. */ for (int i = 0; i < result; i++) { if (ev[i]) { if (FD_ISSET (ev[i]->GetFd(), &errfdset)) { if (ev[i]) { if (getsockopt(ev[i]->GetFd(), SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0) errcode = errno; ev[i]->HandleEvent(EVENT_ERROR, errcode); } continue; } if (ev[i]) { if (writeable[ev[i]->GetFd()]) { if (ev[i]) ev[i]->HandleEvent(EVENT_WRITE); writeable[ev[i]->GetFd()] = false; } else { if (ev[i]) ev[i]->HandleEvent(ev[i]->Readable() ? EVENT_READ : EVENT_WRITE); } } } } return result; } std::string SelectEngine::GetName() { return "select"; } \ No newline at end of file +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * + * This program is free but copyrighted software; see + * the file COPYING for details. + * + * --------------------------------------------------- + */ + +#include "inspircd.h" +#include +#include "socketengine_select.h" + + +SelectEngine::SelectEngine(InspIRCd* Instance) : SocketEngine(Instance) +{ + EngineHandle = 0; + CurrentSetSize = 0; + memset(writeable, 0, sizeof(writeable)); +} + +SelectEngine::~SelectEngine() +{ +} + +bool SelectEngine::AddFd(EventHandler* eh) +{ + int fd = eh->GetFd(); + if ((fd < 0) || (fd > MAX_DESCRIPTORS)) + return false; + + if (GetRemainingFds() <= 1) + return false; + + fds[fd] = fd; + + if (ref[fd]) + return false; + + ref[fd] = eh; + + CurrentSetSize++; + + ServerInstance->Log(DEBUG,"New file descriptor: %d", fd); + return true; +} + +void SelectEngine::WantWrite(EventHandler* eh) +{ + writeable[eh->GetFd()] = true; +} + +bool SelectEngine::DelFd(EventHandler* eh, bool force) +{ + int fd = eh->GetFd(); + + if ((fd < 0) || (fd > MAX_DESCRIPTORS)) + return false; + + std::map::iterator t = fds.find(fd); + if (t != fds.end()) + fds.erase(t); + + CurrentSetSize--; + ref[fd] = NULL; + + ServerInstance->Log(DEBUG,"Remove file descriptor: %d", fd); + return true; +} + +int SelectEngine::GetMaxFds() +{ + return FD_SETSIZE; +} + +int SelectEngine::GetRemainingFds() +{ + return FD_SETSIZE - CurrentSetSize; +} + +int SelectEngine::DispatchEvents() +{ + int result = 0; + timeval tval; + int sresult = 0; + EventHandler* ev[MAX_DESCRIPTORS]; + socklen_t codesize; + int errcode; + + FD_ZERO(&wfdset); + FD_ZERO(&rfdset); + FD_ZERO(&errfdset); + + for (std::map::iterator a = fds.begin(); a != fds.end(); a++) + { + if (ref[a->second]->Readable()) + FD_SET (a->second, &rfdset); + else + FD_SET (a->second, &wfdset); + if (writeable[a->second]) + FD_SET (a->second, &wfdset); + + FD_SET (a->second, &errfdset); + } + tval.tv_sec = 1; + tval.tv_usec = 0; + sresult = select(FD_SETSIZE, &rfdset, &wfdset, &errfdset, &tval); + if (sresult > 0) + { + for (std::map::iterator a = fds.begin(); a != fds.end(); a++) + { + if ((FD_ISSET (a->second, &rfdset)) || (FD_ISSET (a->second, &wfdset)) || FD_ISSET (a->second, &errfdset)) + { + ev[result++] = ref[a->second]; + } + } + } + + /** An event handler may remove its own descriptor from the list, therefore it is not + * safe to directly iterate over the list and dispatch events there with STL iterators. + * Thats a shame because it makes this code slower and more resource intensive, but maybe + * the user should stop using select(), as select() smells anyway. + */ + for (int i = 0; i < result; i++) + { + if (ev[i]) + { + if (FD_ISSET (ev[i]->GetFd(), &errfdset)) + { + if (ev[i]) + { + if (getsockopt(ev[i]->GetFd(), SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0) + errcode = errno; + + ev[i]->HandleEvent(EVENT_ERROR, errcode); + } + continue; + } + if (ev[i]) + { + if (writeable[ev[i]->GetFd()]) + { + if (ev[i]) + ev[i]->HandleEvent(EVENT_WRITE); + writeable[ev[i]->GetFd()] = false; + + } + else + { + if (ev[i]) + ev[i]->HandleEvent(ev[i]->Readable() ? EVENT_READ : EVENT_WRITE); + } + } + } + } + + return result; +} + +std::string SelectEngine::GetName() +{ + return "select"; +} -- cgit v1.3.1-10-gc9f91