m_override: fix parentheses compiler warning

[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 79d69698a1d10ee95e40d966a44051d4e08a37b4..d5f01734782e568d29fbf69457ed7224d1fb25bd 100644 (file)
--- a/src/socketengines/socketengine_epoll.cpp
+++ b/src/socketengines/socketengine_epoll.cpp
@@ -25,7 +25,8 @@
 #include "exitcodes.h"
 #include "socketengine.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().
@@ -53,16 +54,18 @@ public:
 
 EPollEngine::EPollEngine()
 {
-       int max = ulimit(4, 0);
-       if (max > 0)
+       CurrentSetSize = 0;
+
+       struct rlimit limit;
+       if (!getrlimit(RLIMIT_NOFILE, &limit))
        {
-               MAX_DESCRIPTORS = max;
+               MAX_DESCRIPTORS = limit.rlim_cur;
        }
        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);
+               std::cout << "ERROR: Can't determine maximum number of open sockets!" << std::endl;
+               ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE);
        }
 
        // This is not a maximum, just a hint at the eventual number of sockets that may be polled.
@@ -72,9 +75,9 @@ EPollEngine::EPollEngine()
        {
                ServerInstance->Logs->Log("SOCKET",DEFAULT, "ERROR: Could not initialize socket engine: %s", strerror(errno));
                ServerInstance->Logs->Log("SOCKET",DEFAULT, "ERROR: Your kernel probably does not have the proper features. This is a fatal error, exiting now.");
-               printf("ERROR: Could not initialize epoll socket engine: %s\n", strerror(errno));
-               printf("ERROR: Your kernel probably does not have the proper features. This is a fatal error, exiting now.\n");
-               ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
+               std::cout << "ERROR: Could not initialize epoll socket engine: " << strerror(errno) << std::endl;
+               std::cout << "ERROR: Your kernel probably does not have the proper features. This is a fatal error, exiting now." << std::endl;
+               ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE);
        }
 
        ref = new EventHandler* [GetMaxFds()];