Mercurial > hg > nginx

comparison src/event/ngx_event_timer.c @ 7875:0c5e84096d99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Core: added the ngx_rbtree_data() macro.
author Vladimir Homutov <vl@nginx.com>
date Mon, 21 Jun 2021 09:42:43 +0300
parents 03928f7f209b
children
comparison
equal deleted inserted replaced
7874:d1079d6b2f19 7875:0c5e84096d99
71 71
72 if ((ngx_msec_int_t) (node->key - ngx_current_msec) > 0) { 72 if ((ngx_msec_int_t) (node->key - ngx_current_msec) > 0) {
73 return; 73 return;
74 } 74 }
75 75
76 ev = (ngx_event_t *) ((char *) node - offsetof(ngx_event_t, timer)); 76 ev = ngx_rbtree_data(node, ngx_event_t, timer);
77 77
78 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0, 78 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
79 "event timer del: %d: %M", 79 "event timer del: %d: %M",
80 ngx_event_ident(ev->data), ev->timer.key); 80 ngx_event_ident(ev->data), ev->timer.key);
81 81
111 111
112 for (node = ngx_rbtree_min(root, sentinel); 112 for (node = ngx_rbtree_min(root, sentinel);
113 node; 113 node;
114 node = ngx_rbtree_next(&ngx_event_timer_rbtree, node)) 114 node = ngx_rbtree_next(&ngx_event_timer_rbtree, node))
115 { 115 {
116 ev = (ngx_event_t *) ((char *) node - offsetof(ngx_event_t, timer)); 116 ev = ngx_rbtree_data(node, ngx_event_t, timer);
117 117
118 if (!ev->cancelable) { 118 if (!ev->cancelable) {
119 return NGX_AGAIN; 119 return NGX_AGAIN;
120 } 120 }
121 } 121 }