From: Michael Poole <mdpoole@troilus.org>
Date: Mon, 10 May 2004 21:36:58 +0000 (+0000)
Subject: 2004-05-10  Michael Poole <mdpoole@troilus.org>
X-Git-Url: http://git.pk910.de/?a=commitdiff_plain;h=1349b75d52fe12c9509a9875cddf4361c95eb057;p=ircu2.10.12-pk.git

2004-05-10  Michael Poole <mdpoole@troilus.org>

	* ircd/ircd_events.c: Actually reference and try to use the epoll
	event engine.  Omitted from yesterday's commit.


git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1039 c9e4aea6-c8fd-4c43-8297-357d70d61c8c
---

diff --git a/ChangeLog b/ChangeLog
index 680ce49..8ee50c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-10  Michael Poole <mdpoole@troilus.org>
+
+	* ircd/ircd_events.c: Actually reference and try to use the epoll
+	event engine.  Omitted from yesterday's commit.
+
 2004-05-09  Michael Poole <mdpoole@troilus.org>
 
 	Forward port of Paul "Zoot" Chang's pseudo-command.patch and
diff --git a/ircd/ircd_events.c b/ircd/ircd_events.c
index 1371f88..98b9c75 100644
--- a/ircd/ircd_events.c
+++ b/ircd/ircd_events.c
@@ -50,6 +50,13 @@ extern struct Engine engine_devpoll;
 #define ENGINE_DEVPOLL
 #endif /* USE_DEVPOLL */
 
+#ifdef USE_EPOLL
+extern struct Engine engine_epoll;
+#define ENGINE_EPOLL &engine_epoll,
+#else
+#define ENGINE_EPOLL
+#endif /* USE_EPOLL */
+
 #ifdef USE_POLL
 extern struct Engine engine_poll;
 #define ENGINE_FALLBACK	&engine_poll,
@@ -61,6 +68,7 @@ extern struct Engine engine_select;
 /* list of engines to try */
 static const struct Engine *evEngines[] = {
   ENGINE_KQUEUE
+  ENGINE_EPOLL
   ENGINE_DEVPOLL
   ENGINE_FALLBACK
   0