Mercurial > hg > nginx-vendor-0-5
diff src/event/modules/ngx_kqueue_module.c @ 106:45f7329b4bd0 NGINX_0_3_0
nginx 0.3.0
*) Change: the 10-days live time limit of worker process was
eliminated. The limit was introduced because of millisecond timers
overflow.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Fri, 07 Oct 2005 00:00:00 +0400 |
parents | 71c46860eb55 |
children | cf3d6edb3ad6 |
line wrap: on
line diff
--- a/src/event/modules/ngx_kqueue_module.c +++ b/src/event/modules/ngx_kqueue_module.c @@ -445,47 +445,28 @@ ngx_kqueue_process_events(ngx_cycle_t *c { int events, n; ngx_int_t i, instance; - ngx_uint_t lock, accept_lock, expire; + ngx_uint_t lock, accept_lock; ngx_err_t err; - ngx_msec_t timer; + ngx_msec_t timer, delta; ngx_event_t *ev; - ngx_epoch_msec_t delta; struct timeval tv; struct timespec ts, *tp; - for ( ;; ) { - timer = ngx_event_find_timer(); + timer = ngx_event_find_timer(); #if (NGX_THREADS) - if (timer == NGX_TIMER_ERROR) { - return NGX_ERROR; - } + if (timer == NGX_TIMER_ERROR) { + return NGX_ERROR; + } - if (timer == NGX_TIMER_INFINITE || timer > 500) { - timer = 500; - break; - } + if (timer == NGX_TIMER_INFINITE || timer > 500) { + timer = 500; + break; + } #endif - if (timer != 0) { - break; - } - - ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0, - "kevent expired timer"); - - ngx_event_expire_timers((ngx_msec_t) - (ngx_elapsed_msec - ngx_old_elapsed_msec)); - - if (ngx_posted_events && ngx_threaded) { - ngx_wakeup_worker_thread(cycle); - } - } - - ngx_old_elapsed_msec = ngx_elapsed_msec; - expire = 1; accept_lock = 0; if (ngx_accept_mutex) { @@ -504,7 +485,6 @@ ngx_kqueue_process_events(ngx_cycle_t *c || timer > ngx_accept_mutex_delay) { timer = ngx_accept_mutex_delay; - expire = 0; } } } @@ -524,7 +504,6 @@ ngx_kqueue_process_events(ngx_cycle_t *c if (timer == NGX_TIMER_INFINITE) { tp = NULL; - expire = 0; } else { ts.tv_sec = timer / 1000; @@ -549,9 +528,8 @@ ngx_kqueue_process_events(ngx_cycle_t *c ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "kevent events: %d", events); - delta = ngx_elapsed_msec; - ngx_elapsed_msec = (ngx_epoch_msec_t) tv.tv_sec * 1000 - + tv.tv_usec / 1000 - ngx_start_msec; + delta = ngx_current_time; + ngx_current_time = (ngx_msec_t) tv.tv_sec * 1000 + tv.tv_usec / 1000; if (err) { ngx_log_error((err == NGX_EINTR) ? NGX_LOG_INFO : NGX_LOG_ALERT, @@ -561,10 +539,10 @@ ngx_kqueue_process_events(ngx_cycle_t *c } if (timer != NGX_TIMER_INFINITE) { - delta = ngx_elapsed_msec - delta; + delta = ngx_current_time - delta; ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0, - "kevent timer: %d, delta: %d", timer, (int) delta); + "kevent timer: %M, delta: %M", timer, delta); } else { if (events == 0) { @@ -718,9 +696,7 @@ ngx_kqueue_process_events(ngx_cycle_t *c ngx_mutex_unlock(ngx_posted_events_mutex); } - if (expire && delta) { - ngx_event_expire_timers((ngx_msec_t) delta); - } + ngx_event_expire_timers(); if (ngx_posted_events) { if (ngx_threaded) {