diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-01-30 17:39:00 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-01-30 17:39:00 +0000 |
| commit | bbcea6c3d79208d002710734d5f0826e7fc79465 (patch) | |
| tree | d2a9e6650f2592929b613926c3ded9218164423b /src/event/modules/ngx_poll_module.c | |
| parent | 10318a2e4f403d8e96dbdc939ccb51f19afdc180 (diff) | |
| download | nginx-bbcea6c3d79208d002710734d5f0826e7fc79465.tar.gz nginx-bbcea6c3d79208d002710734d5f0826e7fc79465.tar.bz2 | |
nginx-0.0.1-2004-01-30-20:39:00 import
Diffstat (limited to 'src/event/modules/ngx_poll_module.c')
| -rw-r--r-- | src/event/modules/ngx_poll_module.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c index 5f12eb11e..708dbd67a 100644 --- a/src/event/modules/ngx_poll_module.c +++ b/src/event/modules/ngx_poll_module.c @@ -247,14 +247,20 @@ static int ngx_poll_process_events(ngx_log_t *log) err = 0; } - ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0, "poll ready %d", ready); - ngx_gettimeofday(&tv); ngx_time_update(tv.tv_sec); delta = ngx_elapsed_msec; ngx_elapsed_msec = tv.tv_sec * 1000 + tv.tv_usec / 1000 - ngx_start_msec; + ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0, "poll ready %d", ready); + + if (err) { + ngx_log_error((err == NGX_EINTR) ? NGX_LOG_INFO : NGX_LOG_ALERT, + log, err, "poll() failed"); + return NGX_ERROR; + } + if ((int) timer != INFTIM) { delta = ngx_elapsed_msec - delta; @@ -268,12 +274,6 @@ static int ngx_poll_process_events(ngx_log_t *log) } } - if (err) { - ngx_log_error((err == NGX_EINTR) ? NGX_LOG_INFO : NGX_LOG_ALERT, - log, err, "poll() failed"); - return NGX_ERROR; - } - nready = 0; for (i = 0; i < nevents && ready; i++) { |