X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengines%2Fsocketengine_ports.cpp;h=74c36712bad0213e786288a68a79c55c593fb414;hb=ed6176383eef5de23a62c7de70b58b8d80239005;hp=5fc645bb10270e1ea43edc69a39d68fbfaac0b94;hpb=808a0a09577009c2d6e494979c2189426b332aef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socketengines/socketengine_ports.cpp b/src/socketengines/socketengine_ports.cpp index 5fc645bb1..74c36712b 100644 --- a/src/socketengines/socketengine_ports.cpp +++ b/src/socketengines/socketengine_ports.cpp @@ -20,10 +20,6 @@ #include "inspircd.h" #include "exitcodes.h" -#include - -#ifndef SOCKETENGINE_PORTS -#define SOCKETENGINE_PORTS #ifndef __sun # error You need Solaris 10 or later to make use of this code. @@ -32,19 +28,21 @@ #include #include #include -#include "inspircd_config.h" #include "inspircd.h" #include "socketengine.h" #include +#include +#include /** A specialisation of the SocketEngine class, designed to use solaris 10 I/O completion ports */ class PortsEngine : public SocketEngine { private: - /** These are used by epoll() to hold socket events + /** These are used by ports to hold socket events */ - port_event_t* events; + std::vector events; + int EngineHandle; public: /** Create a new PortsEngine */ @@ -53,19 +51,12 @@ public: */ virtual ~PortsEngine(); virtual bool AddFd(EventHandler* eh, int event_mask); - void OnSetEvent(EventHandler* eh, int old_event, int new_event); + virtual void OnSetEvent(EventHandler* eh, int old_mask, int new_mask); virtual void DelFd(EventHandler* eh); virtual int DispatchEvents(); - virtual std::string GetName(); - virtual void WantWrite(EventHandler* eh); }; -#endif - - -#include - -PortsEngine::PortsEngine() +PortsEngine::PortsEngine() : events(1) { int max = ulimit(4, 0); if (max > 0) @@ -74,32 +65,26 @@ PortsEngine::PortsEngine() } else { - 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); } EngineHandle = port_create(); if (EngineHandle == -1) { - ServerInstance->Logs->Log("SOCKET",SPARSE,"ERROR: Could not initialize socket engine: %s", strerror(errno)); - ServerInstance->Logs->Log("SOCKET",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; - - ref = new EventHandler* [GetMaxFds()]; - events = new port_event_t[GetMaxFds()]; - memset(ref, 0, GetMaxFds() * sizeof(EventHandler*)); } PortsEngine::~PortsEngine() { this->Close(EngineHandle); - delete[] ref; - delete[] events; } static int mask_to_events(int event_mask) @@ -118,19 +103,20 @@ bool PortsEngine::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); port_associate(EngineHandle, PORT_SOURCE_FD, fd, mask_to_events(event_mask), eh); - ServerInstance->Logs->Log("SOCKET",DEBUG,"New file descriptor: %d", fd); + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "New file descriptor: %d", fd); CurrentSetSize++; + ResizeDouble(events); + return true; } -void PortsEngine::WantWrite(EventHandler* eh, int old_mask, int new_mask) +void PortsEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask) { 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); @@ -145,10 +131,9 @@ void PortsEngine::DelFd(EventHandler* eh) port_dissociate(EngineHandle, PORT_SOURCE_FD, fd); CurrentSetSize--; - ref[fd] = NULL; + SocketEngine::DelFd(eh); - ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd); - return true; + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d", fd); } int PortsEngine::DispatchEvents() @@ -159,58 +144,53 @@ 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, GetMaxFds() - 1, &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; 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 = GetRef(fd); + if (!eh) + 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 + SetEventMask(eh, mask); + port_associate(EngineHandle, PORT_SOURCE_FD, fd, mask_to_events(mask), eh); + if (portev_events & POLLRDNORM) + { + 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; - EventHandler* eh = ref[fd]; - if (eh) - { - int mask = eh->GetEventMask(); - if (events[i].portev_events & POLLWRNORM) - mask &= ~(FD_WRITE_WILL_BLOCK | FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE); - if (events[i].portev_events & POLLRDNORM) - mask &= ~FD_READ_WILL_BLOCK; - // reinsert port for next time around, pretending to be one-shot for writes - SetEventMask(ev, mask); - port_associate(EngineHandle, PORT_SOURCE_FD, fd, mask_to_events(mask), eh); - if (events[i].portev_events & POLLRDNORM) - { - ReadEvents++; - eh->HandleEvent(EVENT_READ); - if (eh != ref[fd]) - continue; - } - if (events[i].portev_events & POLLWRNORM) - { - WriteEvents++; - eh->HandleEvent(EVENT_WRITE); - } - } - } - default: - break; + WriteEvents++; + eh->HandleEvent(EVENT_WRITE); } } - return i; -} - -std::string PortsEngine::GetName() -{ - return "ports"; + return (int)i; } SocketEngine* CreateSocketEngine()