X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengines%2Fsocketengine_select.cpp;h=e9d7a96602c6410df8168d43e010d6f3ffc5edea;hb=ed6176383eef5de23a62c7de70b58b8d80239005;hp=441fe494a54a40e8d77028abe18fb2a25c7d6e40;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp index 441fe494a..e9d7a9660 100644 --- a/src/socketengines/socketengine_select.cpp +++ b/src/socketengines/socketengine_select.cpp @@ -1,6 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2014 Adam * Copyright (C) 2009 Daniel De Graaf * Copyright (C) 2007-2008 Craig Edwards * @@ -18,31 +19,28 @@ */ -#include "inspircd_config.h" - #include "inspircd.h" #include "socketengine.h" -#ifndef WINDOWS +#ifndef _WIN32 #include -#endif // WINDOWS +#endif // _WIN32 /** A specialisation of the SocketEngine class, designed to use traditional select(). */ class SelectEngine : public SocketEngine { + fd_set ReadSet, WriteSet, ErrSet; + int MaxFD; + public: /** Create a new SelectEngine */ SelectEngine(); - /** Delete a SelectEngine - */ - virtual ~SelectEngine(); virtual bool AddFd(EventHandler* eh, int event_mask); virtual void DelFd(EventHandler* eh); void OnSetEvent(EventHandler* eh, int, int); virtual int DispatchEvents(); - virtual std::string GetName(); }; SelectEngine::SelectEngine() @@ -50,13 +48,10 @@ SelectEngine::SelectEngine() MAX_DESCRIPTORS = FD_SETSIZE; CurrentSetSize = 0; - ref = new EventHandler* [GetMaxFds()]; - memset(ref, 0, GetMaxFds() * sizeof(EventHandler*)); -} - -SelectEngine::~SelectEngine() -{ - delete[] ref; + FD_ZERO(&ReadSet); + FD_ZERO(&WriteSet); + FD_ZERO(&ErrSet); + MaxFD = 0; } bool SelectEngine::AddFd(EventHandler* eh, int event_mask) @@ -65,14 +60,18 @@ bool SelectEngine::AddFd(EventHandler* eh, int event_mask) if ((fd < 0) || (fd > GetMaxFds() - 1)) return false; - if (ref[fd]) + if (!SocketEngine::AddFd(eh)) return false; - ref[fd] = eh; SocketEngine::SetEventMask(eh, event_mask); + OnSetEvent(eh, 0, event_mask); + FD_SET(fd, &ErrSet); + if (fd > MaxFD) + MaxFD = fd; + CurrentSetSize++; - ServerInstance->Logs->Log("SOCKET",DEBUG,"New file descriptor: %d", fd); + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "New file descriptor: %d", fd); return true; } @@ -84,100 +83,95 @@ void SelectEngine::DelFd(EventHandler* eh) return; CurrentSetSize--; - ref[fd] = NULL; + SocketEngine::DelFd(eh); - ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd); + FD_CLR(fd, &ReadSet); + FD_CLR(fd, &WriteSet); + FD_CLR(fd, &ErrSet); + if (fd == MaxFD) + --MaxFD; + + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d", fd); } void SelectEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask) { - // deal with it later + int fd = eh->GetFd(); + int diff = old_mask ^ new_mask; + + if (diff & (FD_WANT_POLL_READ | FD_WANT_FAST_READ)) + { + if (new_mask & (FD_WANT_POLL_READ | FD_WANT_FAST_READ)) + FD_SET(fd, &ReadSet); + else + FD_CLR(fd, &ReadSet); + } + if (diff & (FD_WANT_POLL_WRITE | FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE)) + { + if (new_mask & (FD_WANT_POLL_WRITE | FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE)) + FD_SET(fd, &WriteSet); + else + FD_CLR(fd, &WriteSet); + } } int SelectEngine::DispatchEvents() { - timeval tval; - int sresult = 0; - socklen_t codesize = sizeof(int); - int errcode = 0; - - fd_set wfdset, rfdset, errfdset; - FD_ZERO(&wfdset); - FD_ZERO(&rfdset); - FD_ZERO(&errfdset); - - /* Populate the select FD sets (this is why select sucks compared to epoll, kqueue) */ - for (unsigned int i = 0; i < FD_SETSIZE; i++) - { - 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); - } + static timeval tval = { 1, 0 }; - /* One second wait */ - tval.tv_sec = 1; - tval.tv_usec = 0; + fd_set rfdset = ReadSet, wfdset = WriteSet, errfdset = ErrSet; - sresult = select(FD_SETSIZE, &rfdset, &wfdset, &errfdset, &tval); + int sresult = select(MaxFD + 1, &rfdset, &wfdset, &errfdset, &tval); ServerInstance->UpdateTime(); - /* Nothing to process this time around */ - if (sresult < 1) - return 0; - - for (int i = 0; i < FD_SETSIZE; i++) + for (int i = 0, j = sresult; i <= MaxFD && j > 0; i++) { - EventHandler* ev = ref[i]; - if (ev) + int has_read = FD_ISSET(i, &rfdset), has_write = FD_ISSET(i, &wfdset), has_error = FD_ISSET(i, &errfdset); + + if (!(has_read || has_write || has_error)) + continue; + + --j; + + EventHandler* ev = GetRef(i); + if (!ev) + continue; + + if (has_error) { - if (FD_ISSET (i, &errfdset)) - { - ErrorEvents++; - if (getsockopt(i, SOL_SOCKET, SO_ERROR, (char*)&errcode, &codesize) < 0) - errcode = errno; + ErrorEvents++; + + socklen_t codesize = sizeof(int); + int errcode = 0; + if (getsockopt(i, SOL_SOCKET, SO_ERROR, (char*)&errcode, &codesize) < 0) + errcode = errno; - ev->HandleEvent(EVENT_ERROR, errcode); + ev->HandleEvent(EVENT_ERROR, errcode); + continue; + } + + if (has_read) + { + ReadEvents++; + SetEventMask(ev, ev->GetEventMask() & ~FD_READ_WILL_BLOCK); + ev->HandleEvent(EVENT_READ); + if (ev != GetRef(i)) continue; - } - else - { - /* 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)) - { - ReadEvents++; - SetEventMask(ev, ev->GetEventMask() & ~FD_READ_WILL_BLOCK); - ev->HandleEvent(EVENT_READ); - if (ev != ref[i]) - continue; - } - if (FD_ISSET (i, &wfdset)) - { - WriteEvents++; - SetEventMask(ev, ev->GetEventMask() & ~(FD_WRITE_WILL_BLOCK | FD_WANT_SINGLE_WRITE)); - ev->HandleEvent(EVENT_WRITE); - } - } + } + + if (has_write) + { + WriteEvents++; + int newmask = (ev->GetEventMask() & ~(FD_WRITE_WILL_BLOCK | FD_WANT_SINGLE_WRITE)); + this->OnSetEvent(ev, ev->GetEventMask(), newmask); + SetEventMask(ev, newmask); + ev->HandleEvent(EVENT_WRITE); } } return sresult; } -std::string SelectEngine::GetName() -{ - return "select"; -} - SocketEngine* CreateSocketEngine() { return new SelectEngine;