diff options
Diffstat (limited to '')
| -rw-r--r-- | src/event/ngx_event_timer.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/event/ngx_event_timer.h b/src/event/ngx_event_timer.h index cb61f3660..69de163ae 100644 --- a/src/event/ngx_event_timer.h +++ b/src/event/ngx_event_timer.h @@ -33,15 +33,24 @@ extern ngx_rbtree_t *ngx_event_timer_rbtree; extern ngx_rbtree_t ngx_event_timer_sentinel; +#define ngx_event_ident(p) ((ngx_connection_t *) (p))->fd + ngx_inline static void ngx_event_del_timer(ngx_event_t *ev) { - ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0, - "event timer del: %d", ev->rbtree_key); + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0, + "event timer del: %d: %d", + ngx_event_ident(ev->data), ev->rbtree_key); ngx_rbtree_delete(&ngx_event_timer_rbtree, &ngx_event_timer_sentinel, (ngx_rbtree_t *) &ev->rbtree_key); +#if (NGX_DEBUG) + ev->rbtree_left = NULL; + ev->rbtree_right = NULL; + ev->rbtree_parent = NULL; +#endif + ev->timer_set = 0; } @@ -59,8 +68,9 @@ ngx_inline static void ngx_event_add_timer(ngx_event_t *ev, ngx_msec_t timer) (ngx_elapsed_msec + timer) / NGX_TIMER_RESOLUTION; #endif - ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0, - "event timer add: %d", ev->rbtree_key); + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0, + "event timer add: %d: %d", + ngx_event_ident(ev->data), ev->rbtree_key); ngx_rbtree_insert(&ngx_event_timer_rbtree, &ngx_event_timer_sentinel, (ngx_rbtree_t *) &ev->rbtree_key); |