X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengines%2Fsocketengine_epoll.cpp;h=7ca9da3fd8a113472d0ef3498d95247de2228c2c;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=8548e08248a19d52617ba5be1fc6c743e8b104a3;hpb=0b63ccd0b5cb26883d6becb196fb98e4f95d0397;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengines/socketengine_epoll.cpp b/src/socketengines/socketengine_epoll.cpp
index 8548e0824..7ca9da3fd 100644
--- a/src/socketengines/socketengine_epoll.cpp
+++ b/src/socketengines/socketengine_epoll.cpp
@@ -1,8 +1,16 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2014-2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2014, 2016 Adam <Adam@anope.org>
+ *   Copyright (C) 2013, 2017, 2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 Ariadne Conill <ariadne@dereferenced.org>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2008 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2006, 2008 Robin Burchell <robin+git@viroteck.net>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -19,12 +27,9 @@
 
 
 #include "inspircd.h"
-#include "exitcodes.h"
 
 #include <sys/epoll.h>
-#include <ulimit.h>
-#include <iostream>
-#define EP_DELAY 5
+#include <sys/resource.h>
 
 /** A specialisation of the SocketEngine class, designed to use linux 2.6 epoll().
  */
@@ -34,26 +39,18 @@ namespace
 
 	/** These are used by epoll() to hold socket events
 	 */
-	std::vector<struct epoll_event> events(1);
+	std::vector<struct epoll_event> events(16);
 }
 
 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);
+	LookupMaxFds();
 
 	// 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.
 	EngineHandle = epoll_create(128);
-
 	if (EngineHandle == -1)
-	{
-		ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR: Could not initialize socket engine: %s", strerror(errno));
-		ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR: Your kernel probably does not have the proper features. This is a fatal error, exiting now.");
-		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);
-	}
+		InitError();
 }
 
 void SocketEngine::RecoverFromFork()
@@ -214,7 +211,6 @@ int SocketEngine::DispatchEvents()
 		eh->SetEventMask(mask);
 		if (ev.events & EPOLLIN)
 		{
-			stats.ReadEvents++;
 			eh->OnEventHandlerRead();
 			if (eh != GetRef(fd))
 				// whoa! we got deleted, better not give out the write event
@@ -222,7 +218,6 @@ int SocketEngine::DispatchEvents()
 		}
 		if (ev.events & EPOLLOUT)
 		{
-			stats.WriteEvents++;
 			eh->OnEventHandlerWrite();
 		}
 	}