X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengine_epoll.cpp;h=4ed68ca57a1f913aadfb0cb85e86fe5d9b3136cd;hb=46ff0bed0047c4cd05828c5f46dce63176e5084b;hp=c36e964f82ef85e91e829d9769acd789fce98356;hpb=6fff3c54be91dbbfe5e3ffca4204ad0378d70b7d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengine_epoll.cpp b/src/socketengine_epoll.cpp
index c36e964f8..4ed68ca57 100644
--- a/src/socketengine_epoll.cpp
+++ b/src/socketengine_epoll.cpp
@@ -22,10 +22,10 @@ EPollEngine::EPollEngine(InspIRCd* Instance) : SocketEngine(Instance)
 
 	if (EngineHandle == -1)
 	{
-		ServerInstance->Log(SPARSE,"ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
-		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.");
+		ServerInstance->Log(SPARSE,"ERROR: Could not initialize socket engine: %s", strerror(errno));
+		ServerInstance->Log(SPARSE,"ERROR: Your kernel probably does not have the proper features. This is a fatal error, exiting now.");
+		printf("ERROR: Could not initialize socket engine: %s\n", strerror(errno));
+		printf("ERROR: Your kernel probably does not have the proper features. This is a fatal error, exiting now.\n");
 		InspIRCd::Exit(EXIT_STATUS_SOCKETENGINE);
 	}
 	CurrentSetSize = 0;
@@ -40,37 +40,26 @@ bool EPollEngine::AddFd(EventHandler* eh)
 {
 	int fd = eh->GetFd();
 	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,"Slot %d already occupied",fd);
 		return false;
-	}
 
 	ref[fd] = eh;
-
-	ServerInstance->Log(DEBUG,"***** Add socket %d",fd);
-
 	struct epoll_event ev;
 	memset(&ev,0,sizeof(struct epoll_event));
-	ServerInstance->Log(DEBUG,"epoll: Add socket to events, ep=%d socket=%d",EngineHandle,fd);
 	eh->Readable() ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
 	ev.data.fd = fd;
 	int i = epoll_ctl(EngineHandle, EPOLL_CTL_ADD, fd, &ev);
 	if (i < 0)
 	{
-		ServerInstance->Log(DEBUG,"epoll: List insertion failure!");
 		return false;
 	}
 
+	ServerInstance->Log(DEBUG,"New file descriptor: %d", fd);
 	CurrentSetSize++;
 	return true;
 }
@@ -84,14 +73,10 @@ void EPollEngine::WantWrite(EventHandler* eh)
 	memset(&ev,0,sizeof(struct epoll_event));
 	ev.events = EPOLLOUT;
 	ev.data.fd = eh->GetFd();
-	int i = epoll_ctl(EngineHandle, EPOLL_CTL_MOD, eh->GetFd(), &ev);
-	if (i < 0)
-	{
-		ServerInstance->Log(DEBUG,"epoll: Could not set want write on fd %d!",eh->GetFd());
-	}
+	epoll_ctl(EngineHandle, EPOLL_CTL_MOD, eh->GetFd(), &ev);
 }
 
-bool EPollEngine::DelFd(EventHandler* eh)
+bool EPollEngine::DelFd(EventHandler* eh, bool force)
 {
 	int fd = eh->GetFd();
 	if ((fd < 0) || (fd > MAX_DESCRIPTORS))
@@ -103,12 +88,13 @@ bool EPollEngine::DelFd(EventHandler* eh)
 	ev.data.fd = fd;
 	int i = epoll_ctl(EngineHandle, EPOLL_CTL_DEL, fd, &ev);
 
-	if (i < 0)
+	if (i < 0 && !force)
 		return false;
 
 	CurrentSetSize--;
 	ref[fd] = NULL;
 
+	ServerInstance->Log(DEBUG,"Remove file descriptor: %d", fd);
 	return true;
 }
 
@@ -126,12 +112,11 @@ int EPollEngine::DispatchEvents()
 {
 	socklen_t codesize;
 	int errcode;
-	int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 150);
+	int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 1000);
 	for (int j = 0; j < i; j++)
 	{
 		if (events[j].events & EPOLLHUP)
 		{
-			ServerInstance->Log(DEBUG,"Handle error event on fd %d", events[j].data.fd);
 			if (ref[events[j].data.fd])
 				ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, 0);
 			continue;
@@ -141,7 +126,6 @@ int EPollEngine::DispatchEvents()
 			/* Get error number */
 			if (getsockopt(events[j].data.fd, SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0)
 				errcode = errno;
-			ServerInstance->Log(DEBUG,"Handle error event on fd %d: %s", events[j].data.fd, strerror(errcode));
 			if (ref[events[j].data.fd])
 				ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, errcode);
 			continue;
@@ -152,11 +136,7 @@ int EPollEngine::DispatchEvents()
 			memset(&ev,0,sizeof(struct epoll_event));
 			ev.events = EPOLLIN;
 			ev.data.fd = events[j].data.fd;
-			int i = epoll_ctl(EngineHandle, EPOLL_CTL_MOD, events[j].data.fd, &ev);
-			if (i < 0)
-			{
-				ServerInstance->Log(DEBUG,"epoll: Could not reset fd %d!", events[j].data.fd);
-			}
+			epoll_ctl(EngineHandle, EPOLL_CTL_MOD, events[j].data.fd, &ev);
 			if (ref[events[j].data.fd])
 				ref[events[j].data.fd]->HandleEvent(EVENT_WRITE);
 		}