Mercurial > hg > nginx

comparison src/event/ngx_event.h @ 6465:9fd68d5009e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 8f038068f4bc
children 2cd019520210
comparison
equal deleted inserted replaced
6464:088ef087a011 6465:9fd68d5009e3
341 341
342 #undef NGX_DISABLE_EVENT 342 #undef NGX_DISABLE_EVENT
343 #define NGX_DISABLE_EVENT EV_DISABLE 343 #define NGX_DISABLE_EVENT EV_DISABLE
344 344
345 345
346 #elif (NGX_HAVE_DEVPOLL || NGX_HAVE_EVENTPORT) 346 #elif (NGX_HAVE_DEVPOLL && !(NGX_TEST_BUILD_DEVPOLL)) \
347 || (NGX_HAVE_EVENTPORT && !(NGX_TEST_BUILD_EVENTPORT))
347 348
348 #define NGX_READ_EVENT POLLIN 349 #define NGX_READ_EVENT POLLIN
349 #define NGX_WRITE_EVENT POLLOUT 350 #define NGX_WRITE_EVENT POLLOUT
350 351
351 #define NGX_LEVEL_EVENT 0 352 #define NGX_LEVEL_EVENT 0
352 #define NGX_ONESHOT_EVENT 1 353 #define NGX_ONESHOT_EVENT 1
353 354
354 355
355 #elif (NGX_HAVE_EPOLL) 356 #elif (NGX_HAVE_EPOLL) && !(NGX_TEST_BUILD_EPOLL)
356 357
357 #define NGX_READ_EVENT (EPOLLIN|EPOLLRDHUP) 358 #define NGX_READ_EVENT (EPOLLIN|EPOLLRDHUP)
358 #define NGX_WRITE_EVENT EPOLLOUT 359 #define NGX_WRITE_EVENT EPOLLOUT
359 360
360 #define NGX_LEVEL_EVENT 0 361 #define NGX_LEVEL_EVENT 0