X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengines%2Fsocketengine_select.cpp;h=64cde64ea95948593eb7729493bf6921376fa410;hb=33457adb681562e8b66ba417e3791510adfd0c1e;hp=8ee381877b5b656cf1282efb4d5b3be8ee8e8f90;hpb=da074814501f23680b579feb1ad649c86e8a1348;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp
index 8ee381877..64cde64ea 100644
--- a/src/socketengines/socketengine_select.cpp
+++ b/src/socketengines/socketengine_select.cpp
@@ -2,11 +2,11 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *	    the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -20,19 +20,25 @@
 
 SelectEngine::SelectEngine(InspIRCd* Instance) : SocketEngine(Instance)
 {
+	MAX_DESCRIPTORS = FD_SETSIZE;
 	EngineHandle = 0;
 	CurrentSetSize = 0;
+
+	writeable = new bool [GetMaxFds()];
 	memset(writeable, 0, sizeof(writeable));
+	ref = new EventHandler* [GetMaxFds()];
+	memset(ref, 0, GetMaxFds() * sizeof(EventHandler*));
 }
 
 SelectEngine::~SelectEngine()
 {
+	delete[] ref;
 }
 
 bool SelectEngine::AddFd(EventHandler* eh)
 {
 	int fd = eh->GetFd();
-	if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+	if ((fd < 0) || (fd > GetMaxFds() - 1))
 		return false;
 
 	if (GetRemainingFds() <= 1)
@@ -58,7 +64,7 @@ bool SelectEngine::DelFd(EventHandler* eh, bool force)
 {
 	int fd = eh->GetFd();
 
-	if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+	if ((fd < 0) || (fd > GetMaxFds() - 1))
 		return false;
 
 	std::map<int,int>::iterator t = fds.find(fd);
@@ -67,7 +73,6 @@ bool SelectEngine::DelFd(EventHandler* eh, bool force)
 
 	CurrentSetSize--;
 	ref[fd] = NULL;
-	fds[fd] = 0;
 
 	ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd);
 	return true;
@@ -80,93 +85,86 @@ int SelectEngine::GetMaxFds()
 
 int SelectEngine::GetRemainingFds()
 {
-	return FD_SETSIZE - CurrentSetSize;
+	return GetMaxFds() - CurrentSetSize;
 }
 
 int SelectEngine::DispatchEvents()
 {
-	int result = 0;
 	timeval tval;
 	int sresult = 0;
-	EventHandler* ev[MAX_DESCRIPTORS];
-	socklen_t codesize;
-	int errcode;
+	socklen_t codesize = sizeof(int);
+	int errcode = 0;
 
 	FD_ZERO(&wfdset);
 	FD_ZERO(&rfdset);
 	FD_ZERO(&errfdset);
 
+	/* Populate the select FD set (this is why select sucks compared to epoll, kqueue, IOCP) */
 	for (std::map<int,int>::iterator a = fds.begin(); a != fds.end(); a++)
 	{
 		if (ref[a->second]->Readable())
+			/* Read notifications */
 			FD_SET (a->second, &rfdset);
 		else
+			/* Write notifications */
 			FD_SET (a->second, &wfdset);
+
+		/* Explicitly one-time writeable */
 		if (writeable[a->second])
 			FD_SET (a->second, &wfdset);
 
+		/* All sockets must receive error notifications regardless */
 		FD_SET (a->second, &errfdset);
 	}
+
+	/* One second waits */
 	tval.tv_sec = 1;
 	tval.tv_usec = 0;
+
 	sresult = select(FD_SETSIZE, &rfdset, &wfdset, &errfdset, &tval);
-	if (sresult > 0)
-	{
-		for (std::map<int,int>::iterator a = fds.begin(); a != fds.end(); a++)
-		{
-			if ((FD_ISSET (a->second, &rfdset)) || (FD_ISSET (a->second, &wfdset)) || FD_ISSET (a->second, &errfdset))
-			{
-				ev[result++] = ref[a->second];
-			}
-		}
-	}
 
-	/** An event handler may remove its own descriptor from the list, therefore it is not
-	 * safe to directly iterate over the list and dispatch events there with STL iterators.
-	 * Thats a shame because it makes this code slower and more resource intensive, but maybe
-	 * the user should stop using select(), as select() smells anyway.
-	 */
-	for (int i = 0; i < result; i++)
+	/* Nothing to process this time around */
+	if (sresult < 1)
+		return 0;
+
+	/* Safe assumption (as of 1.1 anyway) that a socket can't remove itself from the list in the middle of the loop */
+	for (std::map<int,int>::iterator a = fds.begin(); a != fds.end(); a++)
 	{
-		if (ev[i])
+		EventHandler* ev = ref[a->second];
+		if (ev)
 		{
-			if (FD_ISSET (ev[i]->GetFd(), &errfdset))
+			if (FD_ISSET (ev->GetFd(), &errfdset))
 			{
 				ErrorEvents++;
-
-				if (getsockopt(ev[i]->GetFd(), SOL_SOCKET, SO_ERROR, (char*)&errcode, &codesize) < 0)
+				if (getsockopt(ev->GetFd(), SOL_SOCKET, SO_ERROR, (char*)&errcode, &codesize) < 0)
 					errcode = errno;
 
-				ev[i]->HandleEvent(EVENT_ERROR, errcode);
-
+				ev->HandleEvent(EVENT_ERROR, errcode);
 				continue;
 			}
 			else
 			{
-				if (writeable[ev[i]->GetFd()])
+				/* NOTE: This is a pair of seperate if statements as the socket
+				 * may be in both read and writeable state at the same time.
+				 * If an error event occurs above it is not worth processing the
+				 * read and write states even if set.
+				 */
+				if (FD_ISSET (ev->GetFd(), &wfdset))
 				{
 					WriteEvents++;
-					writeable[ev[i]->GetFd()] = false;
-					ev[i]->HandleEvent(EVENT_WRITE);
+					writeable[ev->GetFd()] = false;
+					ev->HandleEvent(EVENT_WRITE);
 				}
-				else
+				if (FD_ISSET (ev->GetFd(), &rfdset))
 				{
-					if (ev[i]->Readable())
-					{
 						ReadEvents++;
-						ev[i]->HandleEvent(EVENT_READ);
-					}
-					else
-					{
-						WriteEvents++;
-						ev[i]->HandleEvent(EVENT_WRITE);
-					}
+						ev->HandleEvent(EVENT_READ);
 				}
 			}
 		}
 	}
 
-	return result;
+	return sresult;
 }
 
 std::string SelectEngine::GetName()