diff options
Diffstat (limited to 'src/event/modules/ngx_select_module.c')
| -rw-r--r-- | src/event/modules/ngx_select_module.c | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c index da4303def..57f6f0500 100644 --- a/src/event/modules/ngx_select_module.c +++ b/src/event/modules/ngx_select_module.c @@ -250,7 +250,6 @@ ngx_select_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, int ready, nready; ngx_uint_t i, found; ngx_err_t err; - ngx_msec_t delta; ngx_event_t *ev, **queue; ngx_connection_t *c; struct timeval tv, *tp; @@ -331,26 +330,10 @@ ngx_select_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, err = 0; } - delta = ngx_current_msec; - if (flags & NGX_UPDATE_TIME) { ngx_time_update(0, 0); } - if (timer != NGX_TIMER_INFINITE) { - delta = ngx_current_msec - delta; - - ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0, - "select timer: %M, delta: %M", timer, delta); - - } else { - if (ready == 0) { - ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, - "select() returned no events without timeout"); - return NGX_ERROR; - } - } - ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "select ready %d", ready); @@ -383,8 +366,14 @@ ngx_select_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, #endif - if (nevents == 0) { - return NGX_OK; + if (ready == 0) { + if (timer != NGX_TIMER_INFINITE) { + return NGX_OK; + } + + ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, + "select() returned no events without timeout"); + return NGX_ERROR; } ngx_mutex_lock(ngx_posted_events_mutex); |