Move this to another (yet more appropriate) place, saves some syscalls in an unlikely...

[user/henk/code/inspircd.git] / src / socketengines / socketengine_poll.cpp

diff --git a/src/socketengines/socketengine_poll.cpp b/src/socketengines/socketengine_poll.cpp
index ddeb057d68314c9b58cfab217ed5ea1f435d6806..d6ae5933428f2ad55289233e372de43ed9a03285 100644 (file)
--- a/src/socketengines/socketengine_poll.cpp
+++ b/src/socketengines/socketengine_poll.cpp
@@ -14,16 +14,20 @@
 #include "inspircd.h"
 #include "exitcodes.h"
 #include "socketengines/socketengine_poll.h"
+#include <poll.h>
+#include <ulimit.h>
 
 PollEngine::PollEngine(InspIRCd* Instance) : SocketEngine(Instance)
 {
        // Poll requires no special setup (which is nice).
        CurrentSetSize = 0;
+       MAX_DESCRIPTORS = 0;
 
        ref = new EventHandler* [GetMaxFds()];
-       events = new struct epoll_event[GetMaxFds()];
+       events = new struct pollfd[GetMaxFds()];
 
-       memset(&events, 0, GetMaxFds() * sizeof(struct pollfds*));
+       memset(events, 0, GetMaxFds() * sizeof(struct pollfd));
+       memset(ref, 0, GetMaxFds() * sizeof(EventHandler*));
 }
 
 PollEngine::~PollEngine()
@@ -55,24 +59,24 @@ bool PollEngine::AddFd(EventHandler* eh)
        }
 
        ref[fd] = eh;
-       events[fd]->fd = fd;
+       events[fd].fd = fd;
        if (eh->Readable())
        {
-               events[fd]->events = POLLIN;
+               events[fd].events = POLLIN;
        }
        else
        {
-               events[fd]->events = POLLOUT;
+               events[fd].events = POLLOUT;
        }
 
-       ServerInstance->Log(DEBUG,"New file descriptor: %d (%d)", fd, events[fd]->events);
+       ServerInstance->Logs->Log("SOCKET", DEBUG,"New file descriptor: %d (%d)", fd, events[fd].events);
        CurrentSetSize++;
        return true;
 }
 
 void PollEngine::WantWrite(EventHandler* eh)
 {
-       events[eh->GetFd()]->events = POLLIN | POLLOUT;
+       events[eh->GetFd()].events = POLLIN | POLLOUT;
 }
 
 bool PollEngine::DelFd(EventHandler* eh, bool force)
@@ -80,17 +84,17 @@ bool PollEngine::DelFd(EventHandler* eh, bool force)
        int fd = eh->GetFd();
        if ((fd < 0) || (fd > MAX_DESCRIPTORS))
        {
-               ServerInstance->Logs->Log("SOCKET",DEBUG,"DelFd out of range: (fd: %d, max: %d)", fd, GetMaxFds());
+               ServerInstance->Logs->Log("SOCKET", DEBUG, "DelFd out of range: (fd: %d, max: %d)", fd, GetMaxFds());
                return false;
        }
 
-       events[fd]->fd = -1;
-       events[fd]->events = 0;
+       events[fd].fd = -1;
+       events[fd].events = 0;
 
        CurrentSetSize--;
        ref[fd] = NULL;
 
-       ServerInstance->Log(DEBUG,"Remove file descriptor: %d", fd);
+       ServerInstance->Logs->Log("SOCKET", DEBUG, "Remove file descriptor: %d", fd);
        return true;
 }