cgiirc: Pass hosts to WEBIRC command on rehash. No fucking wonder this never worked...

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

diff --git a/src/socketengines/socketengine_epoll.cpp b/src/socketengines/socketengine_epoll.cpp
index 1a0c5d53ecf75e3a00ebb56c2d1acf366aa36ba9..1be0d7cd2f2943b995cac1e3fdb2080f591609ba 100644 (file)
--- a/src/socketengines/socketengine_epoll.cpp
+++ b/src/socketengines/socketengine_epoll.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -13,12 +13,14 @@
 
 #include "inspircd.h"
 #include "exitcodes.h"
-#include <sys/epoll.h>
 #include "socketengines/socketengine_epoll.h"
+#include <ulimit.h>
 
 EPollEngine::EPollEngine(InspIRCd* Instance) : SocketEngine(Instance)
 {
-       EngineHandle = epoll_create(MAX_DESCRIPTORS);
+       MAX_DESCRIPTORS = 0;
+       // This is not a maximum, just a hint at the eventual number of sockets that may be polled.
+       EngineHandle = epoll_create(GetMaxFds() / 4);
 
        if (EngineHandle == -1)
        {
@@ -29,35 +31,49 @@ EPollEngine::EPollEngine(InspIRCd* Instance) : SocketEngine(Instance)
                ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
        }
        CurrentSetSize = 0;
+
+       ref = new EventHandler* [GetMaxFds()];
+       events = new struct epoll_event[GetMaxFds()];
+
+       memset(ref, 0, GetMaxFds() * sizeof(EventHandler*));
 }
 
 EPollEngine::~EPollEngine()
 {
        this->Close(EngineHandle);
+       delete[] ref;
+       delete[] events;
 }
 
 bool EPollEngine::AddFd(EventHandler* eh)
 {
        int fd = eh->GetFd();
-       if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+       if ((fd < 0) || (fd > GetMaxFds() - 1))
        {
-               ServerInstance->Logs->Log("SOCKET",DEBUG,"Out of range FD");
+               ServerInstance->Logs->Log("SOCKET",DEBUG,"AddFd out of range: (fd: %d, max: %d)", fd, GetMaxFds());
                return false;
        }
 
        if (GetRemainingFds() <= 1)
+       {
+               ServerInstance->Logs->Log("SOCKET",DEBUG,"No remaining FDs cannot add fd: %d", fd);
                return false;
+       }
 
        if (ref[fd])
+       {
+               ServerInstance->Logs->Log("SOCKET",DEBUG,"Attempt to add duplicate fd: %d", fd);
                return false;
+       }
 
        struct epoll_event ev;
-       memset(&ev,0,sizeof(struct epoll_event));
+       memset(&ev,0,sizeof(ev));
        eh->Readable() ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
        ev.data.fd = fd;
        int i = epoll_ctl(EngineHandle, EPOLL_CTL_ADD, fd, &ev);
        if (i < 0)
        {
+               ServerInstance->Logs->Log("SOCKET",DEBUG,"Error adding fd: %d to socketengine: %s", fd, strerror(errno));
                return false;
        }
 
@@ -74,8 +90,8 @@ void EPollEngine::WantWrite(EventHandler* eh)
         * status for us and saves us a call.
         */
        struct epoll_event ev;
-       memset(&ev,0,sizeof(struct epoll_event));
-       ev.events = EPOLLOUT;
+       memset(&ev,0,sizeof(ev));
+       ev.events = EPOLLIN | EPOLLOUT;
        ev.data.fd = eh->GetFd();
        epoll_ctl(EngineHandle, EPOLL_CTL_MOD, eh->GetFd(), &ev);
 }
@@ -83,11 +99,14 @@ void EPollEngine::WantWrite(EventHandler* eh)
 bool EPollEngine::DelFd(EventHandler* eh, bool force)
 {
        int fd = eh->GetFd();
-       if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+       if ((fd < 0) || (fd > GetMaxFds() - 1))
+       {
+               ServerInstance->Logs->Log("SOCKET",DEBUG,"DelFd out of range: (fd: %d, max: %d)", fd, GetMaxFds());
                return false;
+       }
 
        struct epoll_event ev;
-       memset(&ev,0,sizeof(struct epoll_event));
+       memset(&ev,0,sizeof(ev));
        eh->Readable() ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
        ev.data.fd = fd;
        int i = epoll_ctl(EngineHandle, EPOLL_CTL_DEL, fd, &ev);
@@ -107,19 +126,34 @@ bool EPollEngine::DelFd(EventHandler* eh, bool force)
 
 int EPollEngine::GetMaxFds()
 {
-       return MAX_DESCRIPTORS;
+       if (MAX_DESCRIPTORS)
+               return MAX_DESCRIPTORS;
+
+       int max = ulimit(4, 0);
+       if (max > 0)
+       {
+               MAX_DESCRIPTORS = max;
+               return max;
+       }
+       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);
+       }
+       return 0;
 }
 
 int EPollEngine::GetRemainingFds()
 {
-       return MAX_DESCRIPTORS - CurrentSetSize;
+       return GetMaxFds() - CurrentSetSize;
 }
 
 int EPollEngine::DispatchEvents()
 {
-       socklen_t codesize;
+       socklen_t codesize = sizeof(int);
        int errcode;
-       int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 1000);
+       int i = epoll_wait(EngineHandle, events, GetMaxFds() - 1, 1000);
 
        TotalEvents += i;
 
@@ -146,7 +180,7 @@ int EPollEngine::DispatchEvents()
                {
                        WriteEvents++;
                        struct epoll_event ev;
-                       memset(&ev,0,sizeof(struct epoll_event));
+                       memset(&ev,0,sizeof(ev));
                        ev.events = EPOLLIN;
                        ev.data.fd = events[j].data.fd;
                        epoll_ctl(EngineHandle, EPOLL_CTL_MOD, events[j].data.fd, &ev);