X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengine_epoll.cpp;h=4ed68ca57a1f913aadfb0cb85e86fe5d9b3136cd;hb=46ff0bed0047c4cd05828c5f46dce63176e5084b;hp=8e1f72bc7ee609ad08c0a9b4950c8a8c06ec6f46;hpb=d17465716790010b6e3221f9ce49272110276ccf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengine_epoll.cpp b/src/socketengine_epoll.cpp
index 8e1f72bc7..4ed68ca57 100644
--- a/src/socketengine_epoll.cpp
+++ b/src/socketengine_epoll.cpp
@@ -2,27 +2,19 @@
  *       | 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 "exitcodes.h"
 #include <sys/epoll.h>
-#include <vector>
-#include <string>
 #include "socketengine_epoll.h"
-#include "helperfuncs.h"
-#include "inspircd.h"
 
 EPollEngine::EPollEngine(InspIRCd* Instance) : SocketEngine(Instance)
 {
@@ -30,11 +22,11 @@ EPollEngine::EPollEngine(InspIRCd* Instance) : SocketEngine(Instance)
 
 	if (EngineHandle == -1)
 	{
-		log(SPARSE,"ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
-		log(SPARSE,"ERROR: this is a fatal error, exiting now.");
-		printf("ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
-		printf("ERROR: this is a fatal error, exiting now.");
-		InspIRCd::Exit(ERROR);
+		ServerInstance->Log(SPARSE,"ERROR: Could not initialize socket engine: %s", strerror(errno));
+		ServerInstance->Log(SPARSE,"ERROR: Your kernel probably does not have the proper features. This is a fatal error, exiting now.");
+		printf("ERROR: Could not initialize socket engine: %s\n", strerror(errno));
+		printf("ERROR: Your kernel probably does not have the proper features. This is a fatal error, exiting now.\n");
+		InspIRCd::Exit(EXIT_STATUS_SOCKETENGINE);
 	}
 	CurrentSetSize = 0;
 }
@@ -44,66 +36,65 @@ EPollEngine::~EPollEngine()
 	close(EngineHandle);
 }
 
-bool EPollEngine::AddFd(int fd, bool readable, char type)
+bool EPollEngine::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;
-	}
+
 	if (ref[fd])
 		return false;
 
-	ref[fd] = type;
-
-	if (readable)
-	{
-		log(DEBUG,"Set readbit");
-		ref[fd] |= X_READBIT;
-	}
-	log(DEBUG,"Add socket %d",fd);
-
+	ref[fd] = eh;
 	struct epoll_event ev;
 	memset(&ev,0,sizeof(struct epoll_event));
-	log(DEBUG,"epoll: Add socket to events, ep=%d socket=%d",EngineHandle,fd);
-	readable ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
+	eh->Readable() ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
 	ev.data.fd = fd;
 	int i = epoll_ctl(EngineHandle, EPOLL_CTL_ADD, fd, &ev);
 	if (i < 0)
 	{
-		log(DEBUG,"epoll: List insertion failure!");
 		return false;
 	}
 
+	ServerInstance->Log(DEBUG,"New file descriptor: %d", fd);
 	CurrentSetSize++;
 	return true;
 }
 
-bool EPollEngine::DelFd(int fd)
+void EPollEngine::WantWrite(EventHandler* eh)
 {
-	log(DEBUG,"EPollEngine::DelFd(%d)",fd);
+	/** Use oneshot so that the system removes the writeable
+	 * status for us and saves us a call.
+	 */
+	struct epoll_event ev;
+	memset(&ev,0,sizeof(struct epoll_event));
+	ev.events = EPOLLOUT;
+	ev.data.fd = eh->GetFd();
+	epoll_ctl(EngineHandle, EPOLL_CTL_MOD, eh->GetFd(), &ev);
+}
 
+bool EPollEngine::DelFd(EventHandler* eh, bool force)
+{
+	int fd = eh->GetFd();
 	if ((fd < 0) || (fd > MAX_DESCRIPTORS))
 		return false;
 
 	struct epoll_event ev;
 	memset(&ev,0,sizeof(struct epoll_event));
-	ref[fd] && X_READBIT ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
+	eh->Readable() ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
 	ev.data.fd = fd;
 	int i = epoll_ctl(EngineHandle, EPOLL_CTL_DEL, fd, &ev);
-	if (i < 0)
-	{
-		log(DEBUG,"epoll: List deletion failure!");
+
+	if (i < 0 && !force)
 		return false;
-	}
 
 	CurrentSetSize--;
-	ref[fd] = 0;
+	ref[fd] = NULL;
+
+	ServerInstance->Log(DEBUG,"Remove file descriptor: %d", fd);
 	return true;
 }
 
@@ -117,18 +108,50 @@ int EPollEngine::GetRemainingFds()
 	return MAX_DESCRIPTORS - CurrentSetSize;
 }
 
-int EPollEngine::Wait(int* fdlist)
+int EPollEngine::DispatchEvents()
 {
-	int result = 0;
-
-	int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 50);
+	socklen_t codesize;
+	int errcode;
+	int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 1000);
 	for (int j = 0; j < i; j++)
-		fdlist[result++] = events[j].data.fd;
+	{
+		if (events[j].events & EPOLLHUP)
+		{
+			if (ref[events[j].data.fd])
+				ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, 0);
+			continue;
+		}
+		if (events[j].events & EPOLLERR)
+		{
+			/* Get error number */
+			if (getsockopt(events[j].data.fd, SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0)
+				errcode = errno;
+			if (ref[events[j].data.fd])
+				ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, errcode);
+			continue;
+		}
+		if (events[j].events & EPOLLOUT)
+		{
+			struct epoll_event ev;
+			memset(&ev,0,sizeof(struct epoll_event));
+			ev.events = EPOLLIN;
+			ev.data.fd = events[j].data.fd;
+			epoll_ctl(EngineHandle, EPOLL_CTL_MOD, events[j].data.fd, &ev);
+			if (ref[events[j].data.fd])
+				ref[events[j].data.fd]->HandleEvent(EVENT_WRITE);
+		}
+		else
+		{
+			if (ref[events[j].data.fd])
+				ref[events[j].data.fd]->HandleEvent(EVENT_READ);
+		}
+	}
 
-	return result;
+	return i;
 }
 
 std::string EPollEngine::GetName()
 {
 	return "epoll";
 }
+