X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengines%2Fsocketengine_ports.cpp;h=f7c547d4510d79367297db443d3868db868dc579;hb=748b3a0d89e7ecc9a766471b79fb78f63a5ca2bb;hp=648ad3ac103007923b89e46cf38fad3e1db7be68;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengines/socketengine_ports.cpp b/src/socketengines/socketengine_ports.cpp
index 648ad3ac1..f7c547d45 100644
--- a/src/socketengines/socketengine_ports.cpp
+++ b/src/socketengines/socketengine_ports.cpp
@@ -36,6 +36,7 @@
 #include "inspircd.h"
 #include "socketengine.h"
 #include <port.h>
+#include <iostream>
 
 /** A specialisation of the SocketEngine class, designed to use solaris 10 I/O completion ports
  */
@@ -45,20 +46,19 @@ private:
 	/** These are used by epoll() to hold socket events
 	 */
 	port_event_t* events;
+	int EngineHandle;
 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 void OnSetEvent(EventHandler* eh, int old_mask, int new_mask);
 	virtual void DelFd(EventHandler* eh);
 	virtual int DispatchEvents();
 	virtual std::string GetName();
-	virtual void WantWrite(EventHandler* eh);
 };
 
 #endif
@@ -76,8 +76,8 @@ PortsEngine::PortsEngine()
 	else
 	{
 		ServerInstance->Logs->Log("SOCKET", DEFAULT, "ERROR: Can't determine maximum number of open sockets!");
-		printf("ERROR: Can't determine maximum number of open sockets!\n");
-		ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
+		std::cout << "ERROR: Can't determine maximum number of open sockets!" << std::endl;
+		ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE);
 	}
 	EngineHandle = port_create();
 
@@ -85,9 +85,9 @@ PortsEngine::PortsEngine()
 	{
 		ServerInstance->Logs->Log("SOCKET",SPARSE,"ERROR: Could not initialize socket engine: %s", strerror(errno));
 		ServerInstance->Logs->Log("SOCKET",SPARSE,"ERROR: This is a fatal error, exiting now.");
-		printf("ERROR: Could not initialize socket engine: %s\n", strerror(errno));
-		printf("ERROR: This is a fatal error, exiting now.\n");
-		ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
+		std::cout << "ERROR: Could not initialize socket engine: " << strerror(errno) << std::endl;
+		std::cout << "ERROR: This is a fatal error, exiting now." << std::endl;
+		ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE);
 	}
 	CurrentSetSize = 0;
 
@@ -131,7 +131,7 @@ bool PortsEngine::AddFd(EventHandler* eh, int event_mask)
 	return true;
 }
 
-void PortsEngine::WantWrite(EventHandler* eh, int old_mask, int new_mask)
+void PortsEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
 {
 	if (mask_to_events(new_mask) != mask_to_events(old_mask))
 		port_associate(EngineHandle, PORT_SOURCE_FD, eh->GetFd(), mask_to_events(new_mask), eh);
@@ -149,7 +149,6 @@ void PortsEngine::DelFd(EventHandler* eh)
 	ref[fd] = NULL;
 
 	ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd);
-	return true;
 }
 
 int PortsEngine::DispatchEvents()
@@ -160,15 +159,16 @@ int PortsEngine::DispatchEvents()
 	poll_time.tv_nsec = 0;
 
 	unsigned int nget = 1; // used to denote a retrieve request.
-	int i = port_getn(EngineHandle, this->events, GetMaxFds() - 1, &nget, &poll_time);
+	int ret = port_getn(EngineHandle, this->events, GetMaxFds() - 1, &nget, &poll_time);
 	ServerInstance->UpdateTime();
 
 	// first handle an error condition
-	if (i == -1)
-		return i;
+	if (ret == -1)
+		return -1;
 
 	TotalEvents += nget;
 
+	unsigned int i;
 	for (i = 0; i < nget; i++)
 	{
 		switch (this->events[i].portev_source)
@@ -185,7 +185,7 @@ int PortsEngine::DispatchEvents()
 					if (events[i].portev_events & POLLRDNORM)
 						mask &= ~FD_READ_WILL_BLOCK;
 					// reinsert port for next time around, pretending to be one-shot for writes
-					SetEventMask(ev, mask);
+					SetEventMask(eh, mask);
 					port_associate(EngineHandle, PORT_SOURCE_FD, fd, mask_to_events(mask), eh);
 					if (events[i].portev_events & POLLRDNORM)
 					{
@@ -206,7 +206,7 @@ int PortsEngine::DispatchEvents()
 		}
 	}
 
-	return i;
+	return (int)i;
 }
 
 std::string PortsEngine::GetName()