MAJOR: polling: replace epoll with sepoll and remove sepoll
Now that all pollers make use of speculative I/O, there is no point
having two epoll implementations, so replace epoll with the sepoll code
and remove sepoll which has just become the standard epoll method.
diff --git a/include/common/epoll.h b/include/common/epoll.h
index 4953230..cc395cd 100644
--- a/include/common/epoll.h
+++ b/include/common/epoll.h
@@ -2,7 +2,7 @@
* include/common/epoll.h
* epoll definitions for older libc.
*
- * Copyright (C) 2000-2011 Willy Tarreau - w@1wt.eu
+ * Copyright (C) 2000-2012 Willy Tarreau - w@1wt.eu
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -29,7 +29,7 @@
#ifndef _COMMON_EPOLL_H
#define _COMMON_EPOLL_H
-#if defined (__linux__) && (defined(ENABLE_EPOLL) || defined(ENABLE_SEPOLL))
+#if defined (__linux__) && defined(ENABLE_EPOLL)
#ifndef USE_MY_EPOLL
#include <sys/epoll.h>
@@ -94,7 +94,7 @@
#endif /* USE_MY_EPOLL */
-#endif /* __linux__ && (ENABLE_EPOLL || ENABLE_SEPOLL) */
+#endif /* __linux__ && ENABLE_EPOLL */
#endif /* _COMMON_EPOLL_H */
diff --git a/include/types/global.h b/include/types/global.h
index 6b267fb..9d2eedf 100644
--- a/include/types/global.h
+++ b/include/types/global.h
@@ -2,7 +2,7 @@
* include/types/global.h
* Global variables.
*
- * Copyright (C) 2000-2010 Willy Tarreau - w@1wt.eu
+ * Copyright (C) 2000-2012 Willy Tarreau - w@1wt.eu
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -54,9 +54,8 @@
#define GTUNE_USE_POLL (1<<1)
#define GTUNE_USE_EPOLL (1<<2)
#define GTUNE_USE_KQUEUE (1<<3)
-#define GTUNE_USE_SEPOLL (1<<4)
/* platform-specific options */
-#define GTUNE_USE_SPLICE (1<<5)
+#define GTUNE_USE_SPLICE (1<<4)
/* Access level for a stats socket */
#define ACCESS_LVL_NONE 0