Decide that it wasn't quite appropriate :(

[user/henk/code/inspircd.git] / src / socketengine.cpp

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index f910802bb34f30c4feb4c4ce952debd1bae02c08..ec34bf74e6c1c1fa81fc0daf98a2678bc22fbc86 100644 (file)
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *                <Craig@chatspike.net>
@@ -19,7 +19,6 @@
 #include "inspircd.h"
 #ifdef USE_EPOLL
 #include <sys/epoll.h>
-#define EP_DELAY 5
 #endif
 #ifdef USE_KQUEUE
 #include <sys/types.h>
@@ -30,17 +29,18 @@
 #include <string>
 #include "socketengine.h"
 
-char ref[65535];
+char ref[MAX_DESCRIPTORS];
 
 SocketEngine::SocketEngine()
 {
        log(DEBUG,"SocketEngine::SocketEngine()");
 #ifdef USE_EPOLL
-       EngineHandle = epoll_create(65535);
+       EngineHandle = epoll_create(MAX_DESCRIPTORS);
 #endif
 #ifdef USE_KQUEUE
        EngineHandle = kqueue();
 #endif
+       CurrentSetSize = 0;
 }
 
 SocketEngine::~SocketEngine()
@@ -56,7 +56,7 @@ SocketEngine::~SocketEngine()
 
 char SocketEngine::GetType(int fd)
 {
-       if ((fd < 0) || (fd > 65535))
+       if ((fd < 0) || (fd > MAX_DESCRIPTORS))
                return X_EMPTY_SLOT;
        /* Mask off the top bit used for 'read/write' state */
        return (ref[fd] & ~0x80);
@@ -64,8 +64,16 @@ char SocketEngine::GetType(int fd)
 
 bool SocketEngine::AddFd(int fd, bool readable, char type)
 {
-       if ((fd < 0) || (fd > 65535))
+       if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+       {
+               log(DEFAULT,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS);
+               return false;
+       }
+       if (GetRemainingFds() <= 1)
+       {
+               log(DEFAULT,"ERROR: System out of file descriptors!");
                return false;
+       }
 #ifdef USE_SELECT
        fds[fd] = fd;
 #endif
@@ -79,7 +87,7 @@ bool SocketEngine::AddFd(int fd, bool readable, char type)
 #ifdef USE_EPOLL
        struct epoll_event ev;
        log(DEBUG,"epoll: Add socket to events, ep=%d socket=%d",EngineHandle,fd);
-       readable ? ev.events = EPOLLIN | EPOLLET : ev.events = EPOLLOUT | EPOLLET;
+       readable ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
        ev.data.fd = fd;
        int i = epoll_ctl(EngineHandle, EPOLL_CTL_ADD, fd, &ev);
        if (i < 0)
@@ -99,14 +107,15 @@ bool SocketEngine::AddFd(int fd, bool readable, char type)
                return false;
        }
 #endif
-return true;
+       CurrentSetSize++;
+       return true;
 }
 
 bool SocketEngine::DelFd(int fd)
 {
        log(DEBUG,"SocketEngine::DelFd(%d)",fd);
 
-       if ((fd < 0) || (fd > 65535))
+       if ((fd < 0) || (fd > MAX_DESCRIPTORS))
                return false;
 
 #ifdef USE_SELECT
@@ -129,7 +138,7 @@ bool SocketEngine::DelFd(int fd)
 #endif
 #ifdef USE_EPOLL
        struct epoll_event ev;
-       ref[fd] && X_READBIT ? ev.events = EPOLLIN | EPOLLET : ev.events = EPOLLOUT | EPOLLET;
+       ref[fd] && X_READBIT ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
        ev.data.fd = fd;
        int i = epoll_ctl(EngineHandle, EPOLL_CTL_DEL, fd, &ev);
        if (i < 0)
@@ -138,10 +147,37 @@ bool SocketEngine::DelFd(int fd)
                return false;
        }
 #endif
+       CurrentSetSize--;
        ref[fd] = 0;
        return true;
 }
 
+int SocketEngine::GetMaxFds()
+{
+#ifdef USE_SELECT
+       return FD_SETSIZE;
+#endif
+#ifdef USE_KQUEUE
+       return MAX_DESCRIPTORS;
+#endif
+#ifdef USE_EPOLL
+       return MAX_DESCRIPTORS;
+#endif
+}
+
+int SocketEngine::GetRemainingFds()
+{
+#ifdef USE_SELECT
+       return FD_SETSIZE - CurrentSetSize;
+#endif
+#ifdef USE_KQUEUE
+       return MAX_DESCRIPTORS - CurrentSetSize;
+#endif
+#ifdef USE_EPOLL
+       return MAX_DESCRIPTORS - CurrentSetSize;
+#endif
+}
+
 int SocketEngine::Wait(int* fdlist)
 {
        int result = 0;
@@ -177,12 +213,12 @@ int SocketEngine::Wait(int* fdlist)
 #ifdef USE_KQUEUE
        ts.tv_nsec = 10000L;
        ts.tv_sec = 0;
-       int i = kevent(EngineHandle, NULL, 0, &ke_list[0], 65535, &ts);
+       int i = kevent(EngineHandle, NULL, 0, &ke_list[0], MAX_DESCRIPTORS, &ts);
        for (int j = 0; j < i; j++)
                fdlist[result++] = ke_list[j].ident;
 #endif
 #ifdef USE_EPOLL
-       int i = epoll_wait(EngineHandle, events, 65535, 100);
+       int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 100);
        for (int j = 0; j < i; j++)
                fdlist[result++] = events[j].data.fd;
 #endif