X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengines%2Fsocketengine_poll.cpp;h=16917ffbc658a6483c597658ac4412e8f726524e;hb=26cd5393c9308fabe73c41870f06f73a5b001cd7;hp=6f50e27988cceab73496d87326631dcf5b9d311d;hpb=939cb0ba987f927f1ad900d45f98ba6d8e03e9d4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengines/socketengine_poll.cpp b/src/socketengines/socketengine_poll.cpp
index 6f50e2798..16917ffbc 100644
--- a/src/socketengines/socketengine_poll.cpp
+++ b/src/socketengines/socketengine_poll.cpp
@@ -13,7 +13,71 @@
 
 #include "inspircd.h"
 #include "exitcodes.h"
-#include "socketengines/socketengine_poll.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#ifndef __SOCKETENGINE_POLL__
+#define __SOCKETENGINE_POLL__
+
+#include <vector>
+#include <string>
+#include <map>
+#include "inspircd_config.h"
+#include "inspircd.h"
+#include "socketengine.h"
+
+#ifndef WINDOWS
+	#ifndef __USE_XOPEN
+    	    #define __USE_XOPEN /* fuck every fucking OS ever made. needed by poll.h to work.*/
+	#endif
+	#include <poll.h>
+	#include <sys/poll.h>
+#else
+	/* *grumble* */
+	#define struct pollfd WSAPOLLFD
+	#define poll WSAPoll
+#endif
+
+class InspIRCd;
+
+/** A specialisation of the SocketEngine class, designed to use poll().
+ */
+class PollEngine : public SocketEngine
+{
+private:
+	/** These are used by poll() to hold socket events
+	 */
+	struct pollfd *events;
+	/** This map maps fds to an index in the events array.
+	 */
+	std::map<int, unsigned int> fd_mappings;
+public:
+	/** Create a new PollEngine
+	 */
+	PollEngine();
+	/** Delete a PollEngine
+	 */
+	virtual ~PollEngine();
+	virtual bool AddFd(EventHandler* eh, int event_mask);
+	virtual void OnSetEvent(EventHandler* eh, int old_mask, int new_mask);
+	virtual EventHandler* GetRef(int fd);
+	virtual bool DelFd(EventHandler* eh, bool force = false);
+	virtual int DispatchEvents();
+	virtual std::string GetName();
+};
+
+#endif
+
 #include <ulimit.h>
 #ifdef __FreeBSD__
 	#include <sys/sysctl.h>
@@ -63,7 +127,7 @@ static int mask_to_poll(int event_mask)
 	int rv = 0;
 	if (event_mask & (FD_WANT_POLL_READ | FD_WANT_FAST_READ))
 		rv |= POLLIN;
-	if (event_mask & (FD_WANT_POLL_WRITE | FD_WANT_FAST_WRITE))
+	if (event_mask & (FD_WANT_POLL_WRITE | FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE))
 		rv |= POLLOUT;
 	return rv;
 }
@@ -208,7 +272,10 @@ int PollEngine::DispatchEvents()
 			
 			if (events[index].revents & POLLOUT)
 			{
-				SetEventMask(eh, eh->GetEventMask() & ~FD_WRITE_WILL_BLOCK);
+				int mask = eh->GetEventMask();
+				mask &= ~(FD_WRITE_WILL_BLOCK | FD_WANT_SINGLE_WRITE);
+				SetEventMask(eh, mask);
+				events[index].events = mask_to_poll(mask);
 				eh->HandleEvent(EVENT_WRITE);
 			}
 		}
@@ -222,3 +289,7 @@ std::string PollEngine::GetName()
 	return "poll";
 }
 
+SocketEngine* CreateSocketEngine()
+{
+	return new PollEngine;
+}