X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengine_kqueue.cpp;h=50f6242e2914de027b92d613e5c2fd2ec970e54e;hb=9422f4157ccff0482cd70105ada3bd9325455eaa;hp=4d003990308ca3fc728f43237f0021b8a256cdc7;hpb=c662a37341e9787ca8c5e553b3d641a19e3b81c8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengine_kqueue.cpp b/src/socketengine_kqueue.cpp
index 4d0039903..50f6242e2 100644
--- a/src/socketengine_kqueue.cpp
+++ b/src/socketengine_kqueue.cpp
@@ -21,6 +21,16 @@
 
 KQueueEngine::KQueueEngine(InspIRCd* Instance) : SocketEngine(Instance)
 {
+	this->RecoverFromFork();
+}
+
+void KQueueEngine::RecoverFromFork()
+{
+	/*
+	 * The only bad thing about kqueue is that its fd cant survive a fork and is not inherited.
+	 * BUM HATS.
+	 * 
+	 */
 	EngineHandle = kqueue();
 	if (EngineHandle == -1)
 	{
@@ -28,55 +38,42 @@ KQueueEngine::KQueueEngine(InspIRCd* Instance) : SocketEngine(Instance)
 		ServerInstance->Log(SPARSE,"ERROR: this is a fatal error, exiting now.");
 		printf("ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
 		printf("ERROR: this is a fatal error, exiting now.");
-		InspIRCd::Exit(EXIT_STATUS_SOCKETENGINE);
+		ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
 	}
 	CurrentSetSize = 0;
 }
 
 KQueueEngine::~KQueueEngine()
 {
-	ServerInstance->Log(DEBUG,"KQueueEngine::~KQueueEngine()");
-	close(EngineHandle);
+	this->Close(EngineHandle);
 }
 
 bool KQueueEngine::AddFd(EventHandler* eh)
 {
 	int fd = eh->GetFd();
 
-	ServerInstance->Log(DEBUG,"KQueueEngine::AddFd(%d)",fd);
-
 	if ((fd < 0) || (fd > MAX_DESCRIPTORS))
-	{
-		ServerInstance->Log(DEBUG,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS);
 		return false;
-	}
+
 	if (GetRemainingFds() <= 1)
-	{
-		ServerInstance->Log(DEBUG,"ERROR: System out of file descriptors!");
 		return false;
-	}
 
 	if (ref[fd])
-	{
-		ServerInstance->Log(DEBUG,"ERROR: Slot already occupied");
 		return false;
-	}
-
-	ref[fd] = eh;
-	ServerInstance->Log(DEBUG,"Add socket %d",fd);
 
 	struct kevent ke;
-	ServerInstance->Log(DEBUG,"kqueue: Add socket to events, kq=%d socket=%d",EngineHandle,fd);
 	EV_SET(&ke, fd, eh->Readable() ? EVFILT_READ : EVFILT_WRITE, EV_ADD, 0, 0, NULL);
 
 	int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
 	if (i == -1)
 	{
-		ServerInstance->Log(DEBUG,"kqueue: List insertion failure!");
 		return false;
 	}
 
+	ref[fd] = eh;
 	CurrentSetSize++;
+
+	ServerInstance->Log(DEBUG,"New file descriptor: %d", fd);
 	return true;
 }
 
@@ -102,6 +99,7 @@ bool KQueueEngine::DelFd(EventHandler* eh, bool force)
 	CurrentSetSize--;
 	ref[fd] = NULL;
 
+	ServerInstance->Log(DEBUG,"Remove file descriptor: %d", fd);
 	return true;
 }
 
@@ -113,11 +111,7 @@ void KQueueEngine::WantWrite(EventHandler* eh)
 	 */
 	struct kevent ke;
 	EV_SET(&ke, eh->GetFd(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, NULL);
-	int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
-	if (i == -1)
-	{
-		ServerInstance->Log(DEBUG,"kqueue: Unable to set fd %d for wanting write", eh->GetFd());
-	}
+	kevent(EngineHandle, &ke, 1, 0, 0, NULL);
 }
 
 int KQueueEngine::GetMaxFds()
@@ -139,7 +133,6 @@ int KQueueEngine::DispatchEvents()
 	{
 		if (ke_list[j].flags & EV_EOF)
 		{
-			ServerInstance->Log(DEBUG,"kqueue: Error on FD %d", ke_list[j].ident);
 			/* We love you kqueue, oh yes we do *sings*!
 			 * kqueue gives us the error number directly in the EOF state!
 			 * Unlike smelly epoll and select, where we have to getsockopt
@@ -156,11 +149,7 @@ int KQueueEngine::DispatchEvents()
 			 */
 			struct kevent ke;
 			EV_SET(&ke, ke_list[j].ident, EVFILT_READ, EV_ADD, 0, 0, NULL);
-			int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
-			if (i == -1)
-			{
-				ServerInstance->Log(DEBUG,"kqueue: Unable to set fd %d back to just wanting to read!", ke_list[j].ident);
-			}
+			kevent(EngineHandle, &ke, 1, 0, 0, NULL);
 			if (ref[ke_list[j].ident])
 				ref[ke_list[j].ident]->HandleEvent(EVENT_WRITE);
 		}