diff options
author | Igor Sysoev <igor@sysoev.ru> | 2003-12-05 10:11:46 +0300 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2003-12-05 10:11:46 +0300 |
commit | faca119aa5b2375d247c4948ba6791e7d8d2b8bc (patch) | |
tree | f20b0776f49cb24e7ea83bae57cb6c135b73c445 /src/event/ngx_event_timer.c | |
parent | f5003d8a66790932cae5168a913ae234cd4ce709 (diff) |
nginx-0.0.1-2003-12-05-10:11:46 import
Diffstat (limited to 'src/event/ngx_event_timer.c')
-rw-r--r-- | src/event/ngx_event_timer.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c index 296c748ee..db97d01fc 100644 --- a/src/event/ngx_event_timer.c +++ b/src/event/ngx_event_timer.c @@ -23,7 +23,7 @@ void ngx_event_timer_done(ngx_cycle_t *cycle) } -int ngx_event_find_timer(void) +ngx_msec_t ngx_event_find_timer(void) { ngx_rbtree_t *node; @@ -33,7 +33,8 @@ int ngx_event_find_timer(void) return 0; } else { - return node->key * NGX_TIMER_RESOLUTION - ngx_elapsed_msec; + return (ngx_msec_t) + (node->key * NGX_TIMER_RESOLUTION - ngx_elapsed_msec); } } @@ -50,11 +51,11 @@ void ngx_event_expire_timers(ngx_msec_t timer) break; } - if ((ngx_msec_t) node->key <= + if ((ngx_msec_t) node->key <= (ngx_msec_t) (ngx_elapsed_msec + timer) / NGX_TIMER_RESOLUTION) { ev = (ngx_event_t *) - ((char *) node - offsetof(ngx_event_t, rbtree)); + ((char *) node - offsetof(ngx_event_t, rbtree_key)); ngx_del_timer(ev); |