diff options
| author | Stefan Bühler <stbuehler@web.de> | 2010-08-07 11:03:30 +0000 |
|---|---|---|
| committer | Stefan Bühler <stbuehler@web.de> | 2010-08-07 11:03:30 +0000 |
| commit | 743230643e8806514d8012e9e100e232f18a8b08 (patch) | |
| tree | ec37daf7ef1b83b77d7c2579d25f6cda1009d8bb | |
| parent | f8eb52ebdac82e752f9f755ce79b0f88bac613cf (diff) | |
| download | lighttpd-git-743230643e8806514d8012e9e100e232f18a8b08.tar.gz | |
report libev handler in feature list/mod_status
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2755 152afb58-edef-0310-8abb-c4023f1b3aa9
| -rw-r--r-- | src/mod_status.c | 13 | ||||
| -rw-r--r-- | src/server.c | 5 |
2 files changed, 11 insertions, 7 deletions
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 @@ -396,6 +396,11 @@ static void show_features (void) { #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) "\t+ sendfile\n" |