X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fsocketengines%2Fsocketengine_ports.cpp;h=deafd8fcbb60b9548fd25c4a715f96af14583944;hb=30fec322809582f91be70cc1bb16c9678180db76;hp=8e866b311b0f3602a5756cdd56e4fcd6ad496204;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socketengines/socketengine_ports.cpp b/src/socketengines/socketengine_ports.cpp index 8e866b311..deafd8fcb 100644 --- a/src/socketengines/socketengine_ports.cpp +++ b/src/socketengines/socketengine_ports.cpp @@ -1,92 +1,135 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/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" #include "exitcodes.h" + +#ifndef __sun +# error You need Solaris 10 or later to make use of this code. +#endif + +#include +#include +#include +#include "inspircd.h" +#include "socketengine.h" #include -#include "socketengines/socketengine_ports.h" +#include +#include -PortsEngine::PortsEngine(InspIRCd* Instance) : SocketEngine(Instance) +/** A specialisation of the SocketEngine class, designed to use solaris 10 I/O completion ports + */ +namespace +{ + /** These are used by ports to hold socket events + */ + std::vector events(16); + int EngineHandle; +} + +/** Initialize ports engine + */ +void SocketEngine::Init() { + int max = ulimit(4, 0); + if (max > 0) + { + MAX_DESCRIPTORS = max; + } + else + { + 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); + } EngineHandle = port_create(); if (EngineHandle == -1) { - ServerInstance->Log(SPARSE,"ERROR: Could not initialize socket engine: %s", strerror(errno)); - ServerInstance->Log(SPARSE,"ERROR: This is a fatal error, exiting now."); - printf("ERROR: Could not initialize socket engine: %s\n", strerror(errno)); - printf("ERROR: This is a fatal error, exiting now.\n"); - ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE); + ServerInstance->Logs->Log("SOCKET", LOG_SPARSE, "ERROR: Could not initialize socket engine: %s", strerror(errno)); + ServerInstance->Logs->Log("SOCKET", LOG_SPARSE, "ERROR: This is a fatal error, exiting now."); + std::cout << "ERROR: Could not initialize socket engine: " << strerror(errno) << std::endl; + std::cout << "ERROR: This is a fatal error, exiting now." << std::endl; + ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE); } - CurrentSetSize = 0; } -PortsEngine::~PortsEngine() +/** Shutdown the ports engine + */ +void SocketEngine::Deinit() { - this->Close(EngineHandle); + SocketEngine::Close(EngineHandle); } -bool PortsEngine::AddFd(EventHandler* eh) +void SocketEngine::RecoverFromFork() +{ +} + +static int mask_to_events(int event_mask) +{ + int rv = 0; + if (event_mask & (FD_WANT_POLL_READ | FD_WANT_FAST_READ)) + rv |= POLLRDNORM; + if (event_mask & (FD_WANT_POLL_WRITE | FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE)) + rv |= POLLWRNORM; + return rv; +} + +bool SocketEngine::AddFd(EventHandler* eh, int event_mask) { int fd = eh->GetFd(); - if ((fd < 0) || (fd > MAX_DESCRIPTORS)) + if (fd < 0) return false; - if (GetRemainingFds() <= 1) + if (!SocketEngine::AddFdRef(eh)) return false; - if (ref[fd]) - return false; + eh->SetEventMask(event_mask); + port_associate(EngineHandle, PORT_SOURCE_FD, fd, mask_to_events(event_mask), eh); - ref[fd] = eh; - port_associate(EngineHandle, PORT_SOURCE_FD, fd, eh->Readable() ? POLLRDNORM : POLLWRNORM, eh); + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "New file descriptor: %d", fd); + ResizeDouble(events); - ServerInstance->Log(DEBUG,"New file descriptor: %d", fd); - CurrentSetSize++; return true; } -void PortsEngine::WantWrite(EventHandler* eh) +void SocketEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask) { - port_associate(EngineHandle, PORT_SOURCE_FD, eh->GetFd(), POLLWRNORM, eh); + if (mask_to_events(new_mask) != mask_to_events(old_mask)) + port_associate(EngineHandle, PORT_SOURCE_FD, eh->GetFd(), mask_to_events(new_mask), eh); } -bool PortsEngine::DelFd(EventHandler* eh, bool force) +void SocketEngine::DelFd(EventHandler* eh) { int fd = eh->GetFd(); - if ((fd < 0) || (fd > MAX_DESCRIPTORS)) - return false; + if (fd < 0) + return; port_dissociate(EngineHandle, PORT_SOURCE_FD, fd); - CurrentSetSize--; - ref[fd] = NULL; - - ServerInstance->Log(DEBUG,"Remove file descriptor: %d", fd); - return true; -} - -int PortsEngine::GetMaxFds() -{ - return MAX_DESCRIPTORS; -} + SocketEngine::DelFdRef(eh); -int PortsEngine::GetRemainingFds() -{ - return MAX_DESCRIPTORS - CurrentSetSize; + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d", fd); } -int PortsEngine::DispatchEvents() +int SocketEngine::DispatchEvents() { struct timespec poll_time; @@ -94,36 +137,51 @@ int PortsEngine::DispatchEvents() poll_time.tv_nsec = 0; unsigned int nget = 1; // used to denote a retrieve request. - int i = port_getn(EngineHandle, this->events, MAX_DESCRIPTORS, &nget, &poll_time); + int ret = port_getn(EngineHandle, &events[0], events.size(), &nget, &poll_time); + ServerInstance->UpdateTime(); // first handle an error condition - if (i == -1) - return i; + if (ret == -1) + return -1; + + stats.TotalEvents += nget; + unsigned int i; for (i = 0; i < nget; i++) { - switch (this->events[i].portev_source) + port_event_t& ev = events[i]; + + if (ev.portev_source != PORT_SOURCE_FD) + continue; + + // Copy these in case the vector gets resized and ev invalidated + const int fd = ev.portev_object; + const int portev_events = ev.portev_events; + EventHandler* eh = static_cast(ev.portev_user); + if (eh->GetFd() < 0) + continue; + + int mask = eh->GetEventMask(); + if (portev_events & POLLWRNORM) + mask &= ~(FD_WRITE_WILL_BLOCK | FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE); + if (portev_events & POLLRDNORM) + mask &= ~FD_READ_WILL_BLOCK; + // reinsert port for next time around, pretending to be one-shot for writes + eh->SetEventMask(mask); + port_associate(EngineHandle, PORT_SOURCE_FD, fd, mask_to_events(mask), eh); + if (portev_events & POLLRDNORM) + { + stats.ReadEvents++; + eh->HandleEvent(EVENT_READ); + if (eh != GetRef(fd)) + continue; + } + if (portev_events & POLLWRNORM) { - case PORT_SOURCE_FD: - { - int fd = this->events[i].portev_object; - if (ref[fd]) - { - // reinsert port for next time around - port_associate(EngineHandle, PORT_SOURCE_FD, fd, POLLRDNORM, ref[fd]); - ref[fd]->HandleEvent((this->events[i].portev_events & POLLRDNORM) ? EVENT_READ : EVENT_WRITE); - } - } - default: - break; + stats.WriteEvents++; + eh->HandleEvent(EVENT_WRITE); } } - return i; + return (int)i; } - -std::string PortsEngine::GetName() -{ - return "ports"; -} -