diff options
author | Igor Sysoev <igor@sysoev.ru> | 2004-04-15 00:34:05 +0400 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2004-04-15 00:34:05 +0400 |
commit | cccc5528945be46d6afb456e7aba751340af9089 (patch) | |
tree | b734bef5df932252d9f04ddaf39ef80c83b0b0f2 /src/event/ngx_event_timer.c | |
parent | b3968b314f063c42f983ba70becfb9fae97651f0 (diff) |
nginx-0.0.3-2004-04-15-00:34:05 import
Diffstat (limited to 'src/event/ngx_event_timer.c')
-rw-r--r-- | src/event/ngx_event_timer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c index ab97ee195..a3d4d808d 100644 --- a/src/event/ngx_event_timer.c +++ b/src/event/ngx_event_timer.c @@ -40,7 +40,7 @@ ngx_msec_t ngx_event_find_timer(void) ngx_rbtree_t *node; if (ngx_event_timer_rbtree == &ngx_event_timer_sentinel) { - return 0; + return NGX_TIMER_INFINITE; } if (ngx_mutex_lock(ngx_event_timer_mutex) == NGX_ERROR) { @@ -59,7 +59,7 @@ ngx_msec_t ngx_event_find_timer(void) (node->key * NGX_TIMER_RESOLUTION - ngx_elapsed_msec); #endif - return timer > 0 ? timer: -1 ; + return timer > 0 ? timer: 0 ; } @@ -83,7 +83,7 @@ void ngx_event_expire_timers(ngx_msec_t timer) ngx_mutex_unlock(ngx_event_timer_mutex); - if ((ngx_msec_t) node->key <= (ngx_msec_t) + if (node->key <= (ngx_msec_t) (ngx_old_elapsed_msec + timer) / NGX_TIMER_RESOLUTION) { ev = (ngx_event_t *) |