X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengines%2Fsocketengine_select.cpp;h=de366266ff1133f40e3cd8d3cc320b93c626b324;hb=bbeb5ea38686dfeb9537860770bbdb3bd2f9cd3f;hp=48d2bbf81c982ae1dcc95a53c8ca3ed10e0c9dd9;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp index 48d2bbf81..de366266f 100644 --- a/src/socketengines/socketengine_select.cpp +++ b/src/socketengines/socketengine_select.cpp @@ -1,33 +1,63 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007-2008 Craig Edwards * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" -#ifndef WINDOWS -#include -#endif // WINDOWS -#include "socketengines/socketengine_select.h" +#include "socketengine.h" +#ifndef _WIN32 +#include +#endif // _WIN32 -SelectEngine::SelectEngine(InspIRCd* Instance) : SocketEngine(Instance) +/** 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() { MAX_DESCRIPTORS = FD_SETSIZE; - EngineHandle = 0; CurrentSetSize = 0; - writeable = new bool [GetMaxFds()]; - memset(writeable, 0, sizeof(writeable)); ref = new EventHandler* [GetMaxFds()]; memset(ref, 0, GetMaxFds() * sizeof(EventHandler*)); + + FD_ZERO(&ReadSet); + FD_ZERO(&WriteSet); + FD_ZERO(&ErrSet); + MaxFD = 0; } SelectEngine::~SelectEngine() @@ -35,131 +65,120 @@ 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 > GetMaxFds() - 1)) return false; - if (GetRemainingFds() <= 1) - return false; - if (ref[fd]) return false; - fds[fd] = fd; 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; } -void SelectEngine::WantWrite(EventHandler* eh) -{ - writeable[eh->GetFd()] = true; -} - -bool SelectEngine::DelFd(EventHandler* eh, bool force) +void SelectEngine::DelFd(EventHandler* eh) { int fd = eh->GetFd(); if ((fd < 0) || (fd > GetMaxFds() - 1)) - return false; - - std::map::iterator t = fds.find(fd); - if (t != fds.end()) - fds.erase(t); + return; CurrentSetSize--; ref[fd] = NULL; - ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd); - return true; -} + FD_CLR(fd, &ReadSet); + FD_CLR(fd, &WriteSet); + FD_CLR(fd, &ErrSet); + if (fd == MaxFD) + --MaxFD; -int SelectEngine::GetMaxFds() -{ - return FD_SETSIZE; + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d", fd); } -int SelectEngine::GetRemainingFds() -{ - return GetMaxFds() - CurrentSetSize; -} - -int SelectEngine::DispatchEvents() +void SelectEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask) { - timeval tval; - int sresult = 0; - socklen_t codesize = sizeof(int); - int errcode = 0; - - FD_ZERO(&wfdset); - FD_ZERO(&rfdset); - FD_ZERO(&errfdset); + int fd = eh->GetFd(); + int diff = old_mask ^ new_mask; - /* Populate the select FD set (this is why select sucks compared to epoll, kqueue, IOCP) */ - for (std::map::iterator a = fds.begin(); a != fds.end(); a++) + if (diff & (FD_WANT_POLL_READ | FD_WANT_FAST_READ)) { - if (ref[a->second]->Readable()) - /* Read notifications */ - FD_SET (a->second, &rfdset); + if (new_mask & (FD_WANT_POLL_READ | FD_WANT_FAST_READ)) + FD_SET(fd, &ReadSet); else - /* Write notifications */ - FD_SET (a->second, &wfdset); - - /* Explicitly one-time writeable */ - if (writeable[a->second]) - FD_SET (a->second, &wfdset); - - /* All sockets must receive error notifications regardless */ - FD_SET (a->second, &errfdset); + 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() +{ + static timeval tval = { 1, 0 }; - /* One second waits */ - 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; - /* Safe assumption (as of 1.1 anyway) that a socket can't remove itself from the list in the middle of the loop */ - for (std::map::iterator a = fds.begin(); a != fds.end(); a++) + for (int i = 0, j = sresult; i <= MaxFD && j > 0; i++) { - EventHandler* ev = ref[a->second]; - 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) { - if (FD_ISSET (ev->GetFd(), &errfdset)) + --j; + + EventHandler* ev = ref[i]; + if (!ev) + continue; + + if (has_error) { ErrorEvents++; - if (getsockopt(ev->GetFd(), SOL_SOCKET, SO_ERROR, (char*)&errcode, &codesize) < 0) + + 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); continue; } - else + + if (has_read) { - /* 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 (ev->GetFd(), &wfdset)) - { - WriteEvents++; - writeable[ev->GetFd()] = false; - ev->HandleEvent(EVENT_WRITE); - } - if (FD_ISSET (ev->GetFd(), &rfdset)) - { - ReadEvents++; - ev->HandleEvent(EVENT_READ); - } + ReadEvents++; + SetEventMask(ev, ev->GetEventMask() & ~FD_READ_WILL_BLOCK); + ev->HandleEvent(EVENT_READ); + if (ev != ref[i]) + continue; + } + if (has_write) + { + WriteEvents++; + SetEventMask(ev, ev->GetEventMask() & ~(FD_WRITE_WILL_BLOCK | FD_WANT_SINGLE_WRITE)); + ev->HandleEvent(EVENT_WRITE); } } } @@ -171,3 +190,8 @@ std::string SelectEngine::GetName() { return "select"; } + +SocketEngine* CreateSocketEngine() +{ + return new SelectEngine; +}