Mercurial > hg > nginx

diff src/event/ngx_event_timer.h @ 214:e0c502f15852

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.0.1-2003-12-22-12:40:48 import
author Igor Sysoev <igor@sysoev.ru>
date Mon, 22 Dec 2003 09:40:48 +0000
parents f536f91e8e99
children 05592fd7a436
line wrap: on
line diff
--- 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_rb
 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_tim
                              (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);