Mercurial > hg > nginx
changeset 6465:9fd68d5009e3
Fixed --test-build-*.
Fixes various aspects of --test-build-devpoll, --test-build-eventport, and
--test-build-epoll.
In particular, if --test-build-devpoll was used on Linux, then "devpoll"
event method would be preferred over "epoll". Also, wrong definitions of
event macros were chosen.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Mon, 28 Mar 2016 19:29:18 +0300 |
parents | 088ef087a011 |
children | 984687f25998 |
files | src/event/ngx_event.c src/event/ngx_event.h src/os/unix/ngx_posix_config.h |
diffstat | 3 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/event/ngx_event.c Mon Mar 28 13:35:25 2016 +0300 +++ b/src/event/ngx_event.c Mon Mar 28 19:29:18 2016 +0300 @@ -1208,7 +1208,7 @@ #endif -#if (NGX_HAVE_DEVPOLL) +#if (NGX_HAVE_DEVPOLL) && !(NGX_TEST_BUILD_DEVPOLL) module = &ngx_devpoll_module;
--- a/src/event/ngx_event.h Mon Mar 28 13:35:25 2016 +0300 +++ b/src/event/ngx_event.h Mon Mar 28 19:29:18 2016 +0300 @@ -343,7 +343,8 @@ #define NGX_DISABLE_EVENT EV_DISABLE -#elif (NGX_HAVE_DEVPOLL || NGX_HAVE_EVENTPORT) +#elif (NGX_HAVE_DEVPOLL && !(NGX_TEST_BUILD_DEVPOLL)) \ + || (NGX_HAVE_EVENTPORT && !(NGX_TEST_BUILD_EVENTPORT)) #define NGX_READ_EVENT POLLIN #define NGX_WRITE_EVENT POLLOUT @@ -352,7 +353,7 @@ #define NGX_ONESHOT_EVENT 1 -#elif (NGX_HAVE_EPOLL) +#elif (NGX_HAVE_EPOLL) && !(NGX_TEST_BUILD_EPOLL) #define NGX_READ_EVENT (EPOLLIN|EPOLLRDHUP) #define NGX_WRITE_EVENT EPOLLOUT