X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengines%2Fsocketengine_poll.cpp;h=dc63fe0edc9032a660d8ab5e51c4493d09067d97;hb=046da7da9bf57ac9254f76fd1c43eadf1673cdf5;hp=2919988c0fbf6c599e22656dbdb3d636ad25e87f;hpb=594b9e031c9d9c209ab8d2475255442c6eb7a343;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socketengines/socketengine_poll.cpp b/src/socketengines/socketengine_poll.cpp index 2919988c0..dc63fe0ed 100644 --- a/src/socketengines/socketengine_poll.cpp +++ b/src/socketengines/socketengine_poll.cpp @@ -21,51 +21,26 @@ */ -#include -#include -#include -#include #include "exitcodes.h" #include "inspircd.h" -#include "socketengine.h" - -#ifndef _WIN32 -# ifndef __USE_XOPEN -# define __USE_XOPEN /* fuck every fucking OS ever made. needed by poll.h to work.*/ -# endif -# include -# include -# include -#else -# define struct pollfd WSAPOLLFD -# define poll WSAPoll -#endif + +#include +#include /** A specialisation of the SocketEngine class, designed to use poll(). */ -class PollEngine : public SocketEngine +namespace { -private: /** These are used by poll() to hold socket events */ - std::vector events; + std::vector events(16); /** This vector maps fds to an index in the events array. */ - std::vector fd_mappings; -public: - /** Create a new PollEngine - */ - PollEngine(); - virtual bool AddFd(EventHandler* eh, int event_mask); - virtual void OnSetEvent(EventHandler* eh, int old_mask, int new_mask); - virtual void DelFd(EventHandler* eh); - virtual int DispatchEvents(); - virtual std::string GetName(); -}; - -PollEngine::PollEngine() : events(1), fd_mappings(1) + std::vector fd_mappings(16); +} + +void SocketEngine::Init() { - CurrentSetSize = 0; struct rlimit limits; if (!getrlimit(RLIMIT_NOFILE, &limits)) { @@ -73,12 +48,19 @@ PollEngine::PollEngine() : events(1), fd_mappings(1) } else { - ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR: Can't determine maximum number of open sockets: %s", strerror(errno)); - std::cout << "ERROR: Can't determine maximum number of open sockets: " << strerror(errno) << std::endl; - ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE); + // MAX_DESCRIPTORS is mainly used for display purposes, it's not a problem that getrlimit() failed + MAX_DESCRIPTORS = -1; } } +void SocketEngine::Deinit() +{ +} + +void SocketEngine::RecoverFromFork() +{ +} + static int mask_to_poll(int event_mask) { int rv = 0; @@ -89,12 +71,12 @@ static int mask_to_poll(int event_mask) return rv; } -bool PollEngine::AddFd(EventHandler* eh, int event_mask) +bool SocketEngine::AddFd(EventHandler* eh, int event_mask) { int fd = eh->GetFd(); - if ((fd < 0) || (fd > GetMaxFds() - 1)) + if (fd < 0) { - ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "AddFd out of range: (fd: %d, max: %d)", fd, GetMaxFds()); + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "AddFd out of range: (fd: %d)", fd); return false; } @@ -104,14 +86,14 @@ bool PollEngine::AddFd(EventHandler* eh, int event_mask) return false; } - if (!SocketEngine::AddFd(eh)) + unsigned int index = CurrentSetSize; + + if (!SocketEngine::AddFdRef(eh)) { ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Attempt to add duplicate fd: %d", fd); return false; } - unsigned int index = CurrentSetSize; - while (static_cast(fd) >= fd_mappings.size()) fd_mappings.resize(fd_mappings.size() * 2, -1); fd_mappings[fd] = index; @@ -121,12 +103,11 @@ bool PollEngine::AddFd(EventHandler* eh, int event_mask) events[index].events = mask_to_poll(event_mask); ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "New file descriptor: %d (%d; index %d)", fd, events[index].events, index); - SocketEngine::SetEventMask(eh, event_mask); - CurrentSetSize++; + eh->SetEventMask(event_mask); return true; } -void PollEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask) +void SocketEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask) { int fd = eh->GetFd(); if (fd < 0 || static_cast(fd) >= fd_mappings.size() || fd_mappings[fd] == -1) @@ -138,12 +119,12 @@ void PollEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask) events[fd_mappings[fd]].events = mask_to_poll(new_mask); } -void PollEngine::DelFd(EventHandler* eh) +void SocketEngine::DelFd(EventHandler* eh) { int fd = eh->GetFd(); - if ((fd < 0) || (fd > MAX_DESCRIPTORS)) + if (fd < 0) { - ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "DelFd out of range: (fd: %d, max: %d)", fd, GetMaxFds()); + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "DelFd out of range: (fd: %d)", fd); return; } @@ -175,24 +156,19 @@ void PollEngine::DelFd(EventHandler* eh) events[last_index].fd = 0; events[last_index].events = 0; - SocketEngine::DelFd(eh); - - CurrentSetSize--; + SocketEngine::DelFdRef(eh); ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d (index: %d) " "(Filled gap with: %d (index: %d))", fd, index, last_fd, last_index); } -int PollEngine::DispatchEvents() +int SocketEngine::DispatchEvents() { int i = poll(&events[0], CurrentSetSize, 1000); - int index; - socklen_t codesize = sizeof(int); - int errcode; int processed = 0; ServerInstance->UpdateTime(); - for (index = 0; index < CurrentSetSize && processed < i; index++) + for (int index = 0; index < CurrentSetSize && processed < i; index++) { struct pollfd& pfd = events[index]; @@ -216,6 +192,8 @@ int PollEngine::DispatchEvents() if (revents & POLLERR) { // Get error number + socklen_t codesize = sizeof(int); + int errcode; if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0) errcode = errno; eh->HandleEvent(EVENT_ERROR, errcode); @@ -224,7 +202,7 @@ int PollEngine::DispatchEvents() if (revents & POLLIN) { - SetEventMask(eh, eh->GetEventMask() & ~FD_READ_WILL_BLOCK); + eh->SetEventMask(eh->GetEventMask() & ~FD_READ_WILL_BLOCK); eh->HandleEvent(EVENT_READ); if (eh != GetRef(fd)) // whoops, deleted out from under us @@ -235,7 +213,7 @@ int PollEngine::DispatchEvents() { int mask = eh->GetEventMask(); mask &= ~(FD_WRITE_WILL_BLOCK | FD_WANT_SINGLE_WRITE); - SetEventMask(eh, mask); + eh->SetEventMask(mask); // The vector could've been resized, reference can be invalid by now; don't use it events[index].events = mask_to_poll(mask); @@ -245,13 +223,3 @@ int PollEngine::DispatchEvents() return i; } - -std::string PollEngine::GetName() -{ - return "poll"; -} - -SocketEngine* CreateSocketEngine() -{ - return new PollEngine; -}