X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengine_select.cpp;h=ef5f2071f82aa2853f9cab99e4435daf36a23db0;hb=bfdf503e5204ba17479084e688a3605dbc9007a2;hp=8d77da46126706ecb86e622a30936d7ccd4667aa;hpb=3a6885d6a1d30f6e2eb9b1fcd20e949768267318;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengine_select.cpp b/src/socketengine_select.cpp
index 8d77da461..ef5f2071f 100644
--- a/src/socketengine_select.cpp
+++ b/src/socketengine_select.cpp
@@ -2,81 +2,73 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
-#include "globals.h"
 #include "inspircd.h"
-#include <vector>
-#include <string>
+#include <sys/select.h>
 #include "socketengine_select.h"
-#include "helperfuncs.h"
 
-SelectEngine::SelectEngine()
+
+SelectEngine::SelectEngine(InspIRCd* Instance) : SocketEngine(Instance)
 {
-	log(DEBUG,"SelectEngine::SelectEngine()");
 	EngineHandle = 0;
 	CurrentSetSize = 0;
+	memset(writeable, 0, sizeof(writeable));
 }
 
 SelectEngine::~SelectEngine()
 {
-	log(DEBUG,"SelectEngine::~SelectEngine()");
 }
 
-bool SelectEngine::AddFd(int fd, bool readable, char type)
+bool SelectEngine::AddFd(EventHandler* eh)
 {
+	int fd = eh->GetFd();
 	if ((fd < 0) || (fd > MAX_DESCRIPTORS))
-	{
-		log(DEFAULT,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS);
 		return false;
-	}
+
 	if (GetRemainingFds() <= 1)
-	{
-		log(DEFAULT,"ERROR: System out of file descriptors!");
 		return false;
-	}
 
 	fds[fd] = fd;
 
-	ref[fd] = type;
-	if (readable)
-	{
-		log(DEBUG,"Set readbit");
-		ref[fd] |= X_READBIT;
-	}
-	log(DEBUG,"Add socket %d",fd);
+	if (ref[fd])
+		return false;
+
+	ref[fd] = eh;
 
 	CurrentSetSize++;
+
+	ServerInstance->Log(DEBUG,"New file descriptor: %d", fd);
 	return true;
 }
 
-bool SelectEngine::DelFd(int fd)
+void SelectEngine::WantWrite(EventHandler* eh)
+{
+	writeable[eh->GetFd()] = true;
+}
+
+bool SelectEngine::DelFd(EventHandler* eh, bool force)
 {
-	log(DEBUG,"SelectEngine::DelFd(%d)",fd);
+	int fd = eh->GetFd();
 
 	if ((fd < 0) || (fd > MAX_DESCRIPTORS))
 		return false;
 
 	std::map<int,int>::iterator t = fds.find(fd);
 	if (t != fds.end())
-	{
 		fds.erase(t);
-		log(DEBUG,"Deleted fd %d",fd);
-	}
 
 	CurrentSetSize--;
-	ref[fd] = 0;
+	ref[fd] = NULL;
+
+	ServerInstance->Log(DEBUG,"Remove file descriptor: %d", fd);
 	return true;
 }
 
@@ -90,35 +82,79 @@ int SelectEngine::GetRemainingFds()
 	return FD_SETSIZE - CurrentSetSize;
 }
 
-int SelectEngine::Wait(int* fdlist)
+int SelectEngine::DispatchEvents()
 {
 	int result = 0;
+	timeval tval;
+	int sresult = 0;
+	EventHandler* ev[MAX_DESCRIPTORS];
+	socklen_t codesize;
+	int errcode;
 
 	FD_ZERO(&wfdset);
 	FD_ZERO(&rfdset);
-	timeval tval;
-	int sresult;
+	FD_ZERO(&errfdset);
+
 	for (std::map<int,int>::iterator a = fds.begin(); a != fds.end(); a++)
 	{
-		if (ref[a->second] & X_READBIT)
-		{
+		if (ref[a->second]->Readable())
 			FD_SET (a->second, &rfdset);
-		}
 		else
-		{
 			FD_SET (a->second, &wfdset);
-		}
-		
+		if (writeable[a->second])
+			FD_SET (a->second, &wfdset);
+
+		FD_SET (a->second, &errfdset);
 	}
-	tval.tv_sec = 0;
-	tval.tv_usec = 50L;
-	sresult = select(FD_SETSIZE, &rfdset, &wfdset, NULL, &tval);
+	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)))
-				fdlist[result++] = a->second;
+			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++)
+	{
+		if (ev[i])
+		{
+			if (FD_ISSET (ev[i]->GetFd(), &errfdset))
+			{
+				if (ev[i])
+				{
+					if (getsockopt(ev[i]->GetFd(), SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0)
+						errcode = errno;
+
+					ev[i]->HandleEvent(EVENT_ERROR, errcode);
+				}
+				continue;
+			}
+			if (ev[i])
+			{
+				if (writeable[ev[i]->GetFd()])
+				{
+					if (ev[i])
+						ev[i]->HandleEvent(EVENT_WRITE);
+					writeable[ev[i]->GetFd()] = false;
+
+				}
+				else
+				{
+					if (ev[i])
+						ev[i]->HandleEvent(ev[i]->Readable() ? EVENT_READ : EVENT_WRITE);
+				}
+			}
 		}
 	}