Remove a few unnecessary .c_str() calls

[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 1080aa1324f1f45a5ff749d288eda89a53953301..493b22630e406d4dbbf362efaa742d614ed90d30 100644 (file)
--- a/src/socketengines/socketengine_poll.cpp
+++ b/src/socketengines/socketengine_poll.cpp
@@ -27,20 +27,20 @@
 #include <vector>
 #include <string>
 #include <map>
-#include "config.h"
+#include "exitcodes.h"
 #include "inspircd.h"
 #include "socketengine.h"
 
 #ifndef _WIN32
-       #ifndef __USE_XOPEN
-           #define __USE_XOPEN /* fuck every fucking OS ever made. needed by poll.h to work.*/
-       #endif
-       #include <poll.h>
-       #include <sys/poll.h>
+# ifndef __USE_XOPEN
+#  define __USE_XOPEN /* fuck every fucking OS ever made. needed by poll.h to work.*/
+# endif
+# include <poll.h>
+# include <sys/poll.h>
+# include <sys/resource.h>
 #else
-       /* *grumble* */
-       #define struct pollfd WSAPOLLFD
-       #define poll WSAPoll
+# define struct pollfd WSAPOLLFD
+# define poll WSAPoll
 #endif
 
 class InspIRCd;
@@ -73,40 +73,20 @@ public:
 
 #endif
 
-#ifdef BSD
-       #include <sys/sysctl.h>
-#else
-       #include <ulimit.h>
-#endif
-
 PollEngine::PollEngine()
 {
        CurrentSetSize = 0;
-#ifdef BSD
-       int mib[2];
-       size_t len;
-
-       mib[0] = CTL_KERN;
-#ifdef KERN_MAXFILESPERPROC
-       mib[1] = KERN_MAXFILESPERPROC;
-#else
-       mib[1] = KERN_MAXFILES;
-#endif
-       len = sizeof(MAX_DESCRIPTORS);
-       sysctl(mib, 2, &MAX_DESCRIPTORS, &len, NULL, 0);
-#else
-       int max = ulimit(4, 0);
-       if (max > 0)
+       struct rlimit limits;
+       if (!getrlimit(RLIMIT_NOFILE, &limits))
        {
-               MAX_DESCRIPTORS = max;
+               MAX_DESCRIPTORS = limits.rlim_cur;
        }
        else
        {
                ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR: Can't determine maximum number of open sockets: %s", strerror(errno));
                std::cout << "ERROR: Can't determine maximum number of open sockets: " << strerror(errno) << std::endl;
-               ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
+               ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE);
        }
-#endif
 
        ref = new EventHandler* [GetMaxFds()];
        events = new struct pollfd[GetMaxFds()];
@@ -137,13 +117,13 @@ bool PollEngine::AddFd(EventHandler* eh, int event_mask)
        int fd = eh->GetFd();
        if ((fd < 0) || (fd > GetMaxFds() - 1))
        {
-               ServerInstance->Logs->Log("SOCKET",LOG_DEBUG,"AddFd out of range: (fd: %d, max: %d)", fd, GetMaxFds());
+               ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "AddFd out of range: (fd: %d, max: %d)", fd, GetMaxFds());
                return false;
        }
 
        if (fd_mappings.find(fd) != fd_mappings.end())
        {
-               ServerInstance->Logs->Log("SOCKET",LOG_DEBUG,"Attempt to add duplicate fd: %d", fd);
+               ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Attempt to add duplicate fd: %d", fd);
                return false;
        }
 
@@ -154,7 +134,7 @@ bool PollEngine::AddFd(EventHandler* eh, int event_mask)
        events[index].fd = fd;
        events[index].events = mask_to_poll(event_mask);
 
-       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG,"New file descriptor: %d (%d; index %d)", fd, events[fd].events, index);
+       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "New file descriptor: %d (%d; index %d)", fd, events[fd].events, index);
        SocketEngine::SetEventMask(eh, event_mask);
        CurrentSetSize++;
        return true;
@@ -173,7 +153,7 @@ void PollEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
        std::map<int, unsigned int>::iterator it = fd_mappings.find(eh->GetFd());
        if (it == fd_mappings.end())
        {
-               ServerInstance->Logs->Log("SOCKET",LOG_DEBUG,"SetEvents() on unknown fd: %d", eh->GetFd());
+               ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "SetEvents() on unknown fd: %d", eh->GetFd());
                return;
        }
 
@@ -192,7 +172,7 @@ void PollEngine::DelFd(EventHandler* eh)
        std::map<int, unsigned int>::iterator it = fd_mappings.find(fd);
        if (it == fd_mappings.end())
        {
-               ServerInstance->Logs->Log("SOCKET",LOG_DEBUG,"DelFd() on unknown fd: %d", fd);
+               ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "DelFd() on unknown fd: %d", fd);
                return;
        }