diff options
Diffstat (limited to '')
| -rw-r--r-- | src/event/ngx_event.h | 6 | ||||
| -rw-r--r-- | src/event/ngx_event_timer.c | 10 | ||||
| -rw-r--r-- | src/event/ngx_event_timer.h | 2 |
3 files changed, 4 insertions, 14 deletions
diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h index 0c2e5d8fa..344982e21 100644 --- a/src/event/ngx_event.h +++ b/src/event/ngx_event.h @@ -91,8 +91,6 @@ struct ngx_event_s { unsigned short timedout:1; unsigned short timer_set:1; - unsigned short delayed:1; - unsigned short read_discarded:1; unsigned short unexpected_eof:1; @@ -499,7 +497,7 @@ ngx_inline static int ngx_handle_read_event(ngx_event_t *rev, u_int flags) } } - /* aio, iocp, epoll, rt signals */ + /* aio, iocp, epoll, rtsig */ return NGX_OK; } @@ -570,7 +568,7 @@ ngx_inline static int ngx_handle_write_event(ngx_event_t *wev, u_int flags) } } - /* aio, iocp, epoll, rt signals */ + /* aio, iocp, epoll, rtsig */ return NGX_OK; } diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c index a3d4d808d..fb401cf84 100644 --- a/src/event/ngx_event_timer.c +++ b/src/event/ngx_event_timer.c @@ -91,15 +91,7 @@ void ngx_event_expire_timers(ngx_msec_t timer) ngx_del_timer(ev); - if (ev->delayed) { - ev->delayed = 0; - if (ev->ready == 0) { - continue; - } - - } else { - ev->timedout = 1; - } + ev->timedout = 1; if (ngx_threaded) { if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) { diff --git a/src/event/ngx_event_timer.h b/src/event/ngx_event_timer.h index 3ff0e7c10..e7e49d28d 100644 --- a/src/event/ngx_event_timer.h +++ b/src/event/ngx_event_timer.h @@ -85,7 +85,7 @@ ngx_inline static void ngx_event_add_timer(ngx_event_t *ev, ngx_msec_t timer) * for the fast connections. */ - if (key - ev->rbtree_key < 100 / NGX_TIMER_RESOLUTION) { + if (abs(key - ev->rbtree_key) < 100 / NGX_TIMER_RESOLUTION) { ngx_log_debug3(NGX_LOG_DEBUG_EVENT, ev->log, 0, "event timer: %d, old: %d, new: %d", ngx_event_ident(ev->data), ev->rbtree_key, key); |