diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2016-07-15 15:18:57 +0300 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2016-07-15 15:18:57 +0300 |
| commit | 5c2dd3913aad5c4bf7d9056e1336025c2703586b (patch) | |
| tree | 8569c90681ada207b182ff4b583225c7a70f3d9e /src | |
| parent | b60534e0d8f943740fb6847ac0a1ff3091a373d0 (diff) | |
| download | nginx-5c2dd3913aad5c4bf7d9056e1336025c2703586b.tar.gz nginx-5c2dd3913aad5c4bf7d9056e1336025c2703586b.tar.bz2 | |
Events: support for EPOLLEXCLUSIVE.
This flag appeared in Linux 4.5 and is useful for avoiding thundering herd
problem.
The current Linux kernel implementation walks the list of exclusive waiters,
and queues an event to each epfd, until it finds the first waiter that has
threads blocked on it via epoll_wait().
Diffstat (limited to 'src')
| -rw-r--r-- | src/event/modules/ngx_epoll_module.c | 7 | ||||
| -rw-r--r-- | src/event/ngx_event.c | 29 | ||||
| -rw-r--r-- | src/event/ngx_event.h | 8 |
3 files changed, 41 insertions, 3 deletions
diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c index dff778831..c267fd6c7 100644 --- a/src/event/modules/ngx_epoll_module.c +++ b/src/event/modules/ngx_epoll_module.c @@ -27,6 +27,7 @@ #define EPOLLRDHUP 0x2000 +#define EPOLLEXCLUSIVE 0x10000000 #define EPOLLONESHOT 0x40000000 #define EPOLLET 0x80000000 @@ -610,6 +611,12 @@ ngx_epoll_add_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags) op = EPOLL_CTL_ADD; } +#if (NGX_HAVE_EPOLLEXCLUSIVE && NGX_HAVE_EPOLLRDHUP) + if (flags & NGX_EXCLUSIVE_EVENT) { + events &= ~EPOLLRDHUP; + } +#endif + ee.events = events | (uint32_t) flags; ee.data.ptr = (void *) ((uintptr_t) c | ev->instance); diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c index 2f3a098de..9d6c4c91b 100644 --- a/src/event/ngx_event.c +++ b/src/event/ngx_event.c @@ -822,15 +822,38 @@ ngx_event_process_init(ngx_cycle_t *cycle) rev->handler = (c->type == SOCK_STREAM) ? ngx_event_accept : ngx_event_recvmsg; - if (ngx_use_accept_mutex #if (NGX_HAVE_REUSEPORT) - && !ls[i].reuseport + + if (ls[i].reuseport) { + if (ngx_add_event(rev, NGX_READ_EVENT, 0) == NGX_ERROR) { + return NGX_ERROR; + } + + continue; + } + #endif - ) + + if (ngx_use_accept_mutex) { + continue; + } + +#if (NGX_HAVE_EPOLLEXCLUSIVE) + + if ((ngx_event_flags & NGX_USE_EPOLL_EVENT) + && ccf->worker_processes > 1) { + if (ngx_add_event(rev, NGX_READ_EVENT, NGX_EXCLUSIVE_EVENT) + == NGX_ERROR) + { + return NGX_ERROR; + } + continue; } +#endif + if (ngx_add_event(rev, NGX_READ_EVENT, 0) == NGX_ERROR) { return NGX_ERROR; } diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h index 394a0e8e5..27139ee8c 100644 --- a/src/event/ngx_event.h +++ b/src/event/ngx_event.h @@ -367,6 +367,9 @@ extern ngx_uint_t ngx_use_epoll_rdhup; #define NGX_ONESHOT_EVENT EPOLLONESHOT #endif +#if (NGX_HAVE_EPOLLEXCLUSIVE) +#define NGX_EXCLUSIVE_EVENT EPOLLEXCLUSIVE +#endif #elif (NGX_HAVE_POLL) @@ -395,6 +398,11 @@ extern ngx_uint_t ngx_use_epoll_rdhup; #endif +#if (NGX_TEST_BUILD_EPOLL) +#define NGX_EXCLUSIVE_EVENT 0 +#endif + + #ifndef NGX_CLEAR_EVENT #define NGX_CLEAR_EVENT 0 /* dummy declaration */ #endif |
