diff options
Diffstat (limited to 'src/event')
| -rw-r--r-- | src/event/modules/ngx_epoll_module.c | 3 | ||||
| -rw-r--r-- | src/event/modules/ngx_rtsig_module.c | 4 | ||||
| -rw-r--r-- | src/event/ngx_event.h | 16 |
3 files changed, 16 insertions, 7 deletions
diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c index a1d708475..a8e51c646 100644 --- a/src/event/modules/ngx_epoll_module.c +++ b/src/event/modules/ngx_epoll_module.c @@ -172,6 +172,7 @@ static int ngx_epoll_init(ngx_cycle_t *cycle) #else ngx_event_flags = NGX_USE_LEVEL_EVENT #endif + |NGX_HAVE_GREEDY_EVENT |NGX_HAVE_INSTANCE_EVENT; return NGX_OK; @@ -472,7 +473,7 @@ int ngx_epoll_process_events(ngx_cycle_t *cycle) continue; } -#if (NGX_DEBUG) +#if (NGX_DEBUG0) log = c->log ? c->log : cycle->log; #endif diff --git a/src/event/modules/ngx_rtsig_module.c b/src/event/modules/ngx_rtsig_module.c index e5f632a2a..af5d77294 100644 --- a/src/event/modules/ngx_rtsig_module.c +++ b/src/event/modules/ngx_rtsig_module.c @@ -117,7 +117,9 @@ static int ngx_rtsig_init(ngx_cycle_t *cycle) ngx_event_actions = ngx_rtsig_module_ctx.actions; - ngx_event_flags = NGX_USE_SIGIO_EVENT|NGX_HAVE_INSTANCE_EVENT; + ngx_event_flags = NGX_USE_SIGIO_EVENT + |NGX_HAVE_GREEDY_EVENT + |NGX_HAVE_INSTANCE_EVENT; return NGX_OK; } diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h index f3232e7df..e85f531b7 100644 --- a/src/event/ngx_event.h +++ b/src/event/ngx_event.h @@ -230,32 +230,38 @@ extern ngx_event_actions_t ngx_event_actions; #define NGX_HAVE_INSTANCE_EVENT 0x00000020 /* + * The event filter requires to do i/o operation until EAGAIN - + * epoll, rt signals. + */ +#define NGX_HAVE_GREEDY_EVENT 0x00000040 + +/* * The event filter notifies only the changes (the edges) * but not an initial level - early epoll patches. */ -#define NGX_USE_EDGE_EVENT 0x00000040 +#define NGX_USE_EDGE_EVENT 0x00000080 /* * No need to add or delete the event filters - rt signals. */ -#define NGX_USE_SIGIO_EVENT 0x00000080 +#define NGX_USE_SIGIO_EVENT 0x00000100 /* * The alternative event method after the rt signals queue overflow. */ -#define NGX_OVERFLOW_EVENT 0x00000100 +#define NGX_OVERFLOW_EVENT 0x00000200 /* * No need to add or delete the event filters - overlapped, aio_read, * aioread, io_submit. */ -#define NGX_USE_AIO_EVENT 0x00000200 +#define NGX_USE_AIO_EVENT 0x00000400 /* * Need to add socket or handle only once - i/o completion port. * It also requires HAVE_AIO and NGX_USE_AIO_EVENT to be set. */ -#define NGX_USE_IOCP_EVENT 0x00000400 +#define NGX_USE_IOCP_EVENT 0x00000800 |