X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengines%2Fsocketengine_kqueue.cpp;h=8694a0bdd84d4cc2e5249aba5fa4d3f3ed6f5732;hb=748b3a0d89e7ecc9a766471b79fb78f63a5ca2bb;hp=63a877238cf77ad7b88b11b2a741f4fdf0a30eb8;hpb=753f492c4f71bd4445a77e292370b6e7735010a9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengines/socketengine_kqueue.cpp b/src/socketengines/socketengine_kqueue.cpp
index 63a877238..8694a0bdd 100644
--- a/src/socketengines/socketengine_kqueue.cpp
+++ b/src/socketengines/socketengine_kqueue.cpp
@@ -1,24 +1,33 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
+ *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "exitcodes.h"
 #include <sys/types.h>
 #include <sys/event.h>
 #include <sys/time.h>
 #include "socketengine.h"
+#include <iostream>
 
-/** A specialisation of the SocketEngine class, designed to use FreeBSD kqueue().
+/** A specialisation of the SocketEngine class, designed to use BSD kqueue().
  */
 class KQueueEngine : public SocketEngine
 {
@@ -39,7 +48,7 @@ public:
 	virtual ~KQueueEngine();
 	bool AddFd(EventHandler* eh, int event_mask);
 	void OnSetEvent(EventHandler* eh, int old_mask, int new_mask);
-	virtual bool DelFd(EventHandler* eh, bool force = false);
+	virtual void DelFd(EventHandler* eh);
 	virtual int DispatchEvents();
 	virtual std::string GetName();
 	virtual void RecoverFromFork();
@@ -54,14 +63,18 @@ KQueueEngine::KQueueEngine()
 	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);
 	if (MAX_DESCRIPTORS <= 0)
 	{
 		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->RecoverFromFork();
@@ -82,9 +95,9 @@ void KQueueEngine::RecoverFromFork()
 	{
 		ServerInstance->Logs->Log("SOCKET",DEFAULT, "ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
 		ServerInstance->Logs->Log("SOCKET",DEFAULT, "ERROR: this is a fatal error, exiting now.");
-		printf("ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.\n");
-		printf("ERROR: this is a fatal error, exiting now.\n");
-		ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
+		std::cout << "ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features." << std::endl;
+		std::cout << "ERROR: this is a fatal error, exiting now." << std::endl;
+		ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE);
 	}
 	CurrentSetSize = 0;
 }
@@ -127,14 +140,14 @@ bool KQueueEngine::AddFd(EventHandler* eh, int event_mask)
 	return true;
 }
 
-bool KQueueEngine::DelFd(EventHandler* eh, bool force)
+void KQueueEngine::DelFd(EventHandler* eh)
 {
 	int fd = eh->GetFd();
 
 	if ((fd < 0) || (fd > GetMaxFds() - 1))
 	{
 		ServerInstance->Logs->Log("SOCKET",DEFAULT,"DelFd() on invalid fd: %d", fd);
-		return false;
+		return;
 	}
 
 	struct kevent ke;
@@ -148,18 +161,16 @@ bool KQueueEngine::DelFd(EventHandler* eh, bool force)
 	EV_SET(&ke, eh->GetFd(), EVFILT_READ, EV_DELETE, 0, 0, NULL);
 	int j = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
 
-	if ((j < 0) && !force)
+	if (j < 0)
 	{
 		ServerInstance->Logs->Log("SOCKET",DEFAULT,"Failed to remove fd: %d %s",
 					  fd, strerror(errno));
-		return false;
 	}
 
 	CurrentSetSize--;
 	ref[fd] = NULL;
 
 	ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd);
-	return true;
 }
 
 void KQueueEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
@@ -230,6 +241,10 @@ int KQueueEngine::DispatchEvents()
 			const int bits_to_clr = FD_WANT_SINGLE_WRITE | FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
 			SetEventMask(eh, eh->GetEventMask() & ~bits_to_clr);
 			eh->HandleEvent(EVENT_WRITE);
+
+			if (eh != ref[ke_list[j].ident])
+				// whoops, deleted out from under us
+				continue;
 		}
 		if (ke_list[j].filter == EVFILT_READ)
 		{