X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengines%2Fsocketengine_epoll.cpp;h=5552cccf6b2a9167f4f72f03b7445cbfa60ad682;hb=a3802dee4bdfcf3dc11df09c59e6ed1912fbadd9;hp=6028ce2e1297d68f3cf145ae3176630e4cf6ff47;hpb=19bcd43f256258b90c1788e899ea5fe0dc044b4b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengines/socketengine_epoll.cpp b/src/socketengines/socketengine_epoll.cpp
index 6028ce2e1..5552cccf6 100644
--- a/src/socketengines/socketengine_epoll.cpp
+++ b/src/socketengines/socketengine_epoll.cpp
@@ -20,7 +20,8 @@
 EPollEngine::EPollEngine(InspIRCd* Instance) : SocketEngine(Instance)
 {
 	MAX_DESCRIPTORS = 0;
-	EngineHandle = epoll_create(GetMaxFds());
+	// 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)
 	{
@@ -50,15 +51,21 @@ bool EPollEngine::AddFd(EventHandler* eh)
 	int fd = eh->GetFd();
 	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));
@@ -67,6 +74,7 @@ bool EPollEngine::AddFd(EventHandler* eh)
 	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;
 	}
 
@@ -93,7 +101,10 @@ bool EPollEngine::DelFd(EventHandler* eh, bool force)
 {
 	int fd = eh->GetFd();
 	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));