X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengines%2Fsocketengine_ports.cpp;h=23a3c3a4525cc340e420b0b51dfc59d3f57ed2c5;hb=7e46119759b7099c38f543bd38d0186b9806542f;hp=a99806fc49568a034214659480f803d36fdc5388;hpb=939cb0ba987f927f1ad900d45f98ba6d8e03e9d4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengines/socketengine_ports.cpp b/src/socketengines/socketengine_ports.cpp
index a99806fc4..23a3c3a45 100644
--- a/src/socketengines/socketengine_ports.cpp
+++ b/src/socketengines/socketengine_ports.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -14,7 +14,61 @@
 #include "inspircd.h"
 #include "exitcodes.h"
 #include <port.h>
-#include "socketengines/socketengine_ports.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#ifndef __SOCKETENGINE_PORTS__
+#define __SOCKETENGINE_PORTS__
+
+#ifndef __sun
+# error You need Solaris 10 or later to make use of this code.
+#endif
+
+#include <vector>
+#include <string>
+#include <map>
+#include "inspircd_config.h"
+#include "inspircd.h"
+#include "socketengine.h"
+#include <port.h>
+
+/** A specialisation of the SocketEngine class, designed to use solaris 10 I/O completion ports
+ */
+class PortsEngine : public SocketEngine
+{
+private:
+	/** These are used by epoll() to hold socket events
+	 */
+	port_event_t* events;
+public:
+	/** Create a new PortsEngine
+	 * @param Instance The creator of this object
+	 */
+	PortsEngine();
+	/** Delete a PortsEngine
+	 */
+	virtual ~PortsEngine();
+	virtual bool AddFd(EventHandler* eh, int event_mask);
+	void OnSetEvent(EventHandler* eh, int old_event, int new_event);
+	virtual bool DelFd(EventHandler* eh, bool force = false);
+	virtual int DispatchEvents();
+	virtual std::string GetName();
+	virtual void WantWrite(EventHandler* eh);
+};
+
+#endif
+
+
 #include <ulimit.h>
 
 PortsEngine::PortsEngine()
@@ -60,7 +114,7 @@ static int mask_to_events(int event_mask)
 	int rv = 0;
 	if (event_mask & (FD_WANT_POLL_READ | FD_WANT_FAST_READ))
 		rv |= POLLRDNORM;
-	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 |= POLLWRNORM;
 	return rv;
 }
@@ -113,6 +167,7 @@ int PortsEngine::DispatchEvents()
 
 	unsigned int nget = 1; // used to denote a retrieve request.
 	int i = port_getn(EngineHandle, this->events, GetMaxFds() - 1, &nget, &poll_time);
+	ServerInstance->UpdateTime();
 
 	// first handle an error condition
 	if (i == -1)
@@ -132,7 +187,7 @@ int PortsEngine::DispatchEvents()
 				{
 					int mask = eh->GetEventMask();
 					if (events[i].portev_events & POLLWRNORM)
-						mask &= ~(FD_WRITE_WILL_BLOCK | FD_WANT_FAST_WRITE);
+						mask &= ~(FD_WRITE_WILL_BLOCK | FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE);
 					if (events[i].portev_events & POLLRDNORM)
 						mask &= ~FD_READ_WILL_BLOCK;
 					// reinsert port for next time around, pretending to be one-shot for writes
@@ -163,3 +218,7 @@ std::string PortsEngine::GetName()
 	return "ports";
 }
 
+SocketEngine* CreateSocketEngine()
+{
+	return new PortsEngine;
+}