diff --git a/src/mod_status.c b/src/mod_status.c index 6b677f79..e1a11a0b 100644 --- a/src/mod_status.c +++ b/src/mod_status.c @@ -676,21 +676,20 @@ static handler_t mod_status_handle_server_config(server *srv, connection *con, v struct ev_map { fdevent_handler_t et; const char *name; } event_handlers[] = { - /* - poll is most reliable + /* - epoll is most reliable * - select works everywhere - * - linux-* are experimental */ +#ifdef USE_LINUX_EPOLL + { FDEVENT_HANDLER_LINUX_SYSEPOLL, "linux-sysepoll" }, +#endif #ifdef USE_POLL { FDEVENT_HANDLER_POLL, "poll" }, #endif #ifdef USE_SELECT { FDEVENT_HANDLER_SELECT, "select" }, #endif -#ifdef USE_LINUX_EPOLL - { FDEVENT_HANDLER_LINUX_SYSEPOLL, "linux-sysepoll" }, -#endif -#ifdef USE_LINUX_SIGIO - { FDEVENT_HANDLER_LINUX_RTSIG, "linux-rtsig" }, +#ifdef USE_LIBEV + { FDEVENT_HANDLER_LIBEV, "libev" }, #endif #ifdef USE_SOLARIS_DEVPOLL { FDEVENT_HANDLER_SOLARIS_DEVPOLL,"solaris-devpoll" }, diff --git a/src/server.c b/src/server.c index 040d6817..79e78b3b 100644 --- a/src/server.c +++ b/src/server.c @@ -395,6 +395,11 @@ static void show_features (void) { "\t+ kqueue (FreeBSD)\n" #else "\t- kqueue (FreeBSD)\n" +#endif +#ifdef USE_LIBEV + "\t+ libev (generic)\n" +#else + "\t- libev (generic)\n" #endif "\nNetwork handler:\n\n" #if defined(USE_LINUX_SENDFILE) || defined(USE_FREEBSD_SENDFILE) || defined(USE_SOLARIS_SENDFILEV) || defined(USE_AIX_SENDFILE)