Merge v2.0.23 and v2.0.24 into master.

[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 8548e08248a19d52617ba5be1fc6c743e8b104a3..f0a7c20167dde69c955eddfc40960d2ddeb6d5e3 100644 (file)
--- a/src/socketengines/socketengine_epoll.cpp
+++ b/src/socketengines/socketengine_epoll.cpp
@@ -22,9 +22,8 @@
 #include "exitcodes.h"
 
 #include <sys/epoll.h>
-#include <ulimit.h>
+#include <sys/resource.h>
 #include <iostream>
-#define EP_DELAY 5
 
 /** A specialisation of the SocketEngine class, designed to use linux 2.6 epoll().
  */
@@ -39,8 +38,12 @@ namespace
 
 void SocketEngine::Init()
 {
-       // MAX_DESCRIPTORS is mainly used for display purposes, no problem if ulimit() fails and returns a negative number
-       MAX_DESCRIPTORS = ulimit(4, 0);
+       // MAX_DESCRIPTORS is mainly used for display purposes, no problem if getrlimit() fails
+       struct rlimit limit;
+       if (!getrlimit(RLIMIT_NOFILE, &limit))
+       {
+               MAX_DESCRIPTORS = limit.rlim_cur;
+       }
 
        // 128 is not a maximum, just a hint at the eventual number of sockets that may be polled,
        // and it is completely ignored by 2.6.8 and later kernels, except it must be larger than zero.