X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengines%2Fsocketengine_select.cpp;h=f52fb08b8b4e1cd5cd801607eaa13c77c28a7d29;hb=2553e4fff7a5a168ef796dcecb73c7365651c897;hp=b57a83ae856809ff8aeb83934ee477db13271a45;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp index b57a83ae8..f52fb08b8 100644 --- a/src/socketengines/socketengine_select.cpp +++ b/src/socketengines/socketengine_select.cpp @@ -2,164 +2,174 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ +#include "inspircd_config.h" + #include "inspircd.h" -#include -#include "socketengines/socketengine_select.h" +#include "socketengine.h" +#ifndef WINDOWS +#include +#endif // WINDOWS -SelectEngine::SelectEngine(InspIRCd* Instance) : SocketEngine(Instance) +/** A specialisation of the SocketEngine class, designed to use traditional select(). + */ +class SelectEngine : public SocketEngine { - EngineHandle = 0; +public: + /** Create a new SelectEngine + */ + SelectEngine(); + /** Delete a SelectEngine + */ + virtual ~SelectEngine(); + virtual bool AddFd(EventHandler* eh, int event_mask); + virtual bool DelFd(EventHandler* eh, bool force = false); + void OnSetEvent(EventHandler* eh, int, int); + virtual int DispatchEvents(); + virtual std::string GetName(); +}; + +SelectEngine::SelectEngine() +{ + MAX_DESCRIPTORS = FD_SETSIZE; CurrentSetSize = 0; - memset(writeable, 0, sizeof(writeable)); + + ref = new EventHandler* [GetMaxFds()]; + memset(ref, 0, GetMaxFds() * sizeof(EventHandler*)); } SelectEngine::~SelectEngine() { + delete[] ref; } -bool SelectEngine::AddFd(EventHandler* eh) +bool SelectEngine::AddFd(EventHandler* eh, int event_mask) { int fd = eh->GetFd(); - if ((fd < 0) || (fd > MAX_DESCRIPTORS)) - return false; - - if (GetRemainingFds() <= 1) + if ((fd < 0) || (fd > GetMaxFds() - 1)) return false; if (ref[fd]) return false; - fds[fd] = fd; ref[fd] = eh; + SocketEngine::SetEventMask(eh, event_mask); CurrentSetSize++; - ServerInstance->Log(DEBUG,"New file descriptor: %d", fd); + ServerInstance->Logs->Log("SOCKET",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)) + if ((fd < 0) || (fd > GetMaxFds() - 1)) return false; - std::map::iterator t = fds.find(fd); - if (t != fds.end()) - fds.erase(t); - CurrentSetSize--; ref[fd] = NULL; - fds[fd] = 0; - ServerInstance->Log(DEBUG,"Remove file descriptor: %d", fd); + ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd); return true; } -int SelectEngine::GetMaxFds() -{ - return FD_SETSIZE; -} - -int SelectEngine::GetRemainingFds() +void SelectEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask) { - return FD_SETSIZE - CurrentSetSize; + // deal with it later } int SelectEngine::DispatchEvents() { - int result = 0; timeval tval; int sresult = 0; - EventHandler* ev[MAX_DESCRIPTORS]; - socklen_t codesize; - int errcode; + socklen_t codesize = sizeof(int); + int errcode = 0; + fd_set wfdset, rfdset, errfdset; FD_ZERO(&wfdset); FD_ZERO(&rfdset); FD_ZERO(&errfdset); - for (std::map::iterator a = fds.begin(); a != fds.end(); a++) + /* Populate the select FD sets (this is why select sucks compared to epoll, kqueue) */ + for (unsigned int i = 0; i < FD_SETSIZE; i++) { - 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); + EventHandler* eh = ref[i]; + if (!eh) + continue; + int state = eh->GetEventMask(); + if (state & (FD_WANT_POLL_READ | FD_WANT_FAST_READ)) + FD_SET (i, &rfdset); + if (state & (FD_WANT_POLL_WRITE | FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE)) + FD_SET (i, &wfdset); + FD_SET (i, &errfdset); } + + /* One second wait */ 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++) + /* Nothing to process this time around */ + if (sresult < 1) + return 0; + + for (int i = 0; i < FD_SETSIZE; i++) { - if (ev[i]) + EventHandler* ev = ref[i]; + if (ev) { - if (FD_ISSET (ev[i]->GetFd(), &errfdset)) + if (FD_ISSET (i, &errfdset)) { - if (ev[i]) - { - if (getsockopt(ev[i]->GetFd(), SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0) - errcode = errno; + ErrorEvents++; + if (getsockopt(i, SOL_SOCKET, SO_ERROR, (char*)&errcode, &codesize) < 0) + errcode = errno; - ev[i]->HandleEvent(EVENT_ERROR, errcode); - } + ev->HandleEvent(EVENT_ERROR, errcode); continue; } - if (ev[i]) + else { - if (writeable[ev[i]->GetFd()]) + /* NOTE: This is a pair of seperate if statements as the socket + * may be in both read and writeable state at the same time. + * If an error event occurs above it is not worth processing the + * read and write states even if set. + */ + if (FD_ISSET (i, &rfdset)) { - writeable[ev[i]->GetFd()] = false; - if (ev[i]) - ev[i]->HandleEvent(EVENT_WRITE); + ReadEvents++; + SetEventMask(ev, ev->GetEventMask() & ~FD_READ_WILL_BLOCK); + ev->HandleEvent(EVENT_READ); } - else + if (FD_ISSET (i, &wfdset)) { - if (ev[i]) - ev[i]->HandleEvent(ev[i]->Readable() ? EVENT_READ : EVENT_WRITE); + WriteEvents++; + SetEventMask(ev, ev->GetEventMask() & ~(FD_WRITE_WILL_BLOCK | FD_WANT_SINGLE_WRITE)); + ev->HandleEvent(EVENT_WRITE); } } } } - return result; + return sresult; } std::string SelectEngine::GetName() { return "select"; } + +SocketEngine* CreateSocketEngine() +{ + return new SelectEngine; +}