X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengines%2Fsocketengine_kqueue.cpp;h=53bd741f066ecee2562797eae06e74cba3e207b5;hb=ed6176383eef5de23a62c7de70b58b8d80239005;hp=c1aa0c6ee9f5f5acfc615b3cf40cc33f1a340ef8;hpb=70cd4a5a06ea4251ca128636e17bf5ff385f9b5b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socketengines/socketengine_kqueue.cpp b/src/socketengines/socketengine_kqueue.cpp index c1aa0c6ee..53bd741f0 100644 --- a/src/socketengines/socketengine_kqueue.cpp +++ b/src/socketengines/socketengine_kqueue.cpp @@ -1,24 +1,34 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2010 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2009 Uli Schlachter + * 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" #include "exitcodes.h" #include #include #include #include "socketengine.h" +#include +#include -/** A specialisation of the SocketEngine class, designed to use FreeBSD kqueue(). +/** A specialisation of the SocketEngine class, designed to use BSD kqueue(). */ class KQueueEngine : public SocketEngine { @@ -26,7 +36,7 @@ private: int EngineHandle; /** These are used by kqueue() to hold socket events */ - struct kevent* ke_list; + std::vector ke_list; /** This is a specialised time value used by kqueue() */ struct timespec ts; @@ -41,33 +51,31 @@ public: void OnSetEvent(EventHandler* eh, int old_mask, int new_mask); virtual void DelFd(EventHandler* eh); virtual int DispatchEvents(); - virtual std::string GetName(); virtual void RecoverFromFork(); }; -#include - -KQueueEngine::KQueueEngine() +KQueueEngine::KQueueEngine() : ke_list(1) { MAX_DESCRIPTORS = 0; int mib[2]; size_t len; mib[0] = CTL_KERN; +#ifdef KERN_MAXFILESPERPROC mib[1] = KERN_MAXFILESPERPROC; +#else + mib[1] = KERN_MAXFILES; +#endif len = sizeof(MAX_DESCRIPTORS); sysctl(mib, 2, &MAX_DESCRIPTORS, &len, NULL, 0); if (MAX_DESCRIPTORS <= 0) { - ServerInstance->Logs->Log("SOCKET", DEFAULT, "ERROR: Can't determine maximum number of open sockets!"); - printf("ERROR: Can't determine maximum number of open sockets!\n"); - ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE); + ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR: Can't determine maximum number of open sockets!"); + std::cout << "ERROR: Can't determine maximum number of open sockets!" << std::endl; + ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE); } this->RecoverFromFork(); - ke_list = new struct kevent[GetMaxFds()]; - ref = new EventHandler* [GetMaxFds()]; - memset(ref, 0, GetMaxFds() * sizeof(EventHandler*)); } void KQueueEngine::RecoverFromFork() @@ -80,11 +88,11 @@ void KQueueEngine::RecoverFromFork() EngineHandle = kqueue(); if (EngineHandle == -1) { - ServerInstance->Logs->Log("SOCKET",DEFAULT, "ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features."); - ServerInstance->Logs->Log("SOCKET",DEFAULT, "ERROR: this is a fatal error, exiting now."); - printf("ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.\n"); - printf("ERROR: this is a fatal error, exiting now.\n"); - ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE); + ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features."); + ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR: this is a fatal error, exiting now."); + std::cout << "ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features." << std::endl; + std::cout << "ERROR: this is a fatal error, exiting now." << std::endl; + ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE); } CurrentSetSize = 0; } @@ -92,8 +100,6 @@ void KQueueEngine::RecoverFromFork() KQueueEngine::~KQueueEngine() { this->Close(EngineHandle); - delete[] ref; - delete[] ke_list; } bool KQueueEngine::AddFd(EventHandler* eh, int event_mask) @@ -103,7 +109,7 @@ bool KQueueEngine::AddFd(EventHandler* eh, int event_mask) if ((fd < 0) || (fd > GetMaxFds() - 1)) return false; - if (ref[fd]) + if (!SocketEngine::AddFd(eh)) return false; // We always want to read from the socket... @@ -113,17 +119,18 @@ bool KQueueEngine::AddFd(EventHandler* eh, int event_mask) int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL); if (i == -1) { - ServerInstance->Logs->Log("SOCKET",DEFAULT,"Failed to add fd: %d %s", + ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Failed to add fd: %d %s", fd, strerror(errno)); return false; } - ref[fd] = eh; + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "New file descriptor: %d", fd); + SocketEngine::SetEventMask(eh, event_mask); OnSetEvent(eh, 0, event_mask); CurrentSetSize++; + ResizeDouble(ke_list); - ServerInstance->Logs->Log("SOCKET",DEBUG,"New file descriptor: %d", fd); return true; } @@ -133,7 +140,7 @@ void KQueueEngine::DelFd(EventHandler* eh) if ((fd < 0) || (fd > GetMaxFds() - 1)) { - ServerInstance->Logs->Log("SOCKET",DEFAULT,"DelFd() on invalid fd: %d", fd); + ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "DelFd() on invalid fd: %d", fd); return; } @@ -150,14 +157,14 @@ void KQueueEngine::DelFd(EventHandler* eh) if (j < 0) { - ServerInstance->Logs->Log("SOCKET",DEFAULT,"Failed to remove fd: %d %s", + ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Failed to remove fd: %d %s", fd, strerror(errno)); } + SocketEngine::DelFd(eh); CurrentSetSize--; - ref[fd] = NULL; - ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd); + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d", fd); } void KQueueEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask) @@ -168,10 +175,9 @@ void KQueueEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask) struct kevent ke; EV_SET(&ke, eh->GetFd(), EVFILT_WRITE, EV_ADD, 0, 0, NULL); int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL); - if (i < 0) { - ServerInstance->Logs->Log("SOCKET",DEFAULT,"Failed to mark for writing: %d %s", + if (i < 0) + ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Failed to mark for writing: %d %s", eh->GetFd(), strerror(errno)); - } } else if ((old_mask & FD_WANT_POLL_WRITE) && !(new_mask & FD_WANT_POLL_WRITE)) { @@ -179,10 +185,9 @@ void KQueueEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask) struct kevent ke; EV_SET(&ke, eh->GetFd(), EVFILT_WRITE, EV_DELETE, 0, 0, NULL); int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL); - if (i < 0) { - ServerInstance->Logs->Log("SOCKET",DEFAULT,"Failed to mark for writing: %d %s", + if (i < 0) + ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Failed to mark for writing: %d %s", eh->GetFd(), strerror(errno)); - } } if ((new_mask & (FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE)) && !(old_mask & (FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE))) { @@ -190,10 +195,9 @@ void KQueueEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask) struct kevent ke; EV_SET(&ke, eh->GetFd(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, NULL); int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL); - if (i < 0) { - ServerInstance->Logs->Log("SOCKET",DEFAULT,"Failed to mark for writing: %d %s", + if (i < 0) + ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Failed to mark for writing: %d %s", eh->GetFd(), strerror(errno)); - } } } @@ -202,23 +206,33 @@ int KQueueEngine::DispatchEvents() ts.tv_nsec = 0; ts.tv_sec = 1; - int i = kevent(EngineHandle, NULL, 0, &ke_list[0], GetMaxFds(), &ts); + int i = kevent(EngineHandle, NULL, 0, &ke_list[0], ke_list.size(), &ts); ServerInstance->UpdateTime(); + if (i < 0) + return i; + TotalEvents += i; for (int j = 0; j < i; j++) { - EventHandler* eh = ref[ke_list[j].ident]; + struct kevent& kev = ke_list[j]; + + // Copy these in case the vector gets resized and kev invalidated + const int fd = kev.ident; + const short filter = kev.filter; + + EventHandler* eh = GetRef(fd); if (!eh) continue; - if (ke_list[j].flags & EV_EOF) + + if (kev.flags & EV_EOF) { ErrorEvents++; - eh->HandleEvent(EVENT_ERROR, ke_list[j].fflags); + eh->HandleEvent(EVENT_ERROR, kev.fflags); continue; } - if (ke_list[j].filter == EVFILT_WRITE) + if (filter == EVFILT_WRITE) { WriteEvents++; /* When mask is FD_WANT_FAST_WRITE or FD_WANT_SINGLE_WRITE, @@ -228,12 +242,8 @@ int KQueueEngine::DispatchEvents() const int bits_to_clr = FD_WANT_SINGLE_WRITE | FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK; SetEventMask(eh, eh->GetEventMask() & ~bits_to_clr); eh->HandleEvent(EVENT_WRITE); - - if (eh != ref[ke_list[j].ident]) - // whoops, deleted out from under us - continue; } - if (ke_list[j].filter == EVFILT_READ) + else if (filter == EVFILT_READ) { ReadEvents++; SetEventMask(eh, eh->GetEventMask() & ~FD_READ_WILL_BLOCK); @@ -244,11 +254,6 @@ int KQueueEngine::DispatchEvents() return i; } -std::string KQueueEngine::GetName() -{ - return "kqueue"; -} - SocketEngine* CreateSocketEngine() { return new KQueueEngine;