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 680ce49878b62bcdb623cba1ae08491b2fd6d5e4..8ee50c806a1825dca1778685e90977e231e5a7bd 100644 (file)
--- 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 1371f88f84d841c1e71c23d03ee12486cbdb8733..98b9c7589acc750452fa7561c8817ce236a9dec2 100644 (file)
--- 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