Mercurial > hg > nginx-quic
changeset 5896:3efdd7788bb0
Events: introduced cancelable timers.
author | Valentin Bartenev <vbart@nginx.com> |
---|---|
date | Wed, 13 Aug 2014 22:45:04 +0400 |
parents | 0f53e5fb7205 |
children | dff86e2246a5 |
files | src/event/ngx_event.h src/event/ngx_event_timer.c src/event/ngx_event_timer.h src/os/unix/ngx_process_cycle.c src/os/win32/ngx_process_cycle.c |
diffstat | 5 files changed, 49 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/event/ngx_event.h +++ b/src/event/ngx_event.h @@ -136,6 +136,8 @@ struct ngx_event_s { unsigned channel:1; unsigned resolver:1; + unsigned cancelable:1; + #if 0
--- a/src/event/ngx_event_timer.c +++ b/src/event/ngx_event_timer.c @@ -94,3 +94,45 @@ ngx_event_expire_timers(void) ev->handler(ev); } } + + +void +ngx_event_cancel_timers(void) +{ + ngx_event_t *ev; + ngx_rbtree_node_t *node, *root, *sentinel; + + sentinel = ngx_event_timer_rbtree.sentinel; + + for ( ;; ) { + root = ngx_event_timer_rbtree.root; + + if (root == sentinel) { + return; + } + + node = ngx_rbtree_min(root, sentinel); + + ev = (ngx_event_t *) ((char *) node - offsetof(ngx_event_t, timer)); + + if (!ev->cancelable) { + return; + } + + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0, + "event timer cancel: %d: %M", + ngx_event_ident(ev->data), ev->timer.key); + + ngx_rbtree_delete(&ngx_event_timer_rbtree, &ev->timer); + +#if (NGX_DEBUG) + ev->timer.left = NULL; + ev->timer.right = NULL; + ev->timer.parent = NULL; +#endif + + ev->timer_set = 0; + + ev->handler(ev); + } +}
--- a/src/event/ngx_event_timer.h +++ b/src/event/ngx_event_timer.h @@ -22,6 +22,7 @@ ngx_int_t ngx_event_timer_init(ngx_log_t *log); ngx_msec_t ngx_event_find_timer(void); void ngx_event_expire_timers(void); +void ngx_event_cancel_timers(void); extern ngx_rbtree_t ngx_event_timer_rbtree;