Mercurial > hg > nginx
comparison src/event/ngx_event_timer.c @ 5820:3377f9459e99
Events: removed broken thread support from posted events.
It's mostly dead code. And the idea of thread support for this task has
been deprecated.
author | Valentin Bartenev <vbart@nginx.com> |
---|---|
date | Mon, 01 Sep 2014 18:20:03 +0400 |
parents | 876e6b0814a5 |
children | 1f513d7f1b45 |
comparison
equal
deleted
inserted
replaced
5819:8e7ee4c70a3c | 5820:3377f9459e99 |
---|---|
96 /* node->key <= ngx_current_time */ | 96 /* node->key <= ngx_current_time */ |
97 | 97 |
98 if ((ngx_msec_int_t) (node->key - ngx_current_msec) <= 0) { | 98 if ((ngx_msec_int_t) (node->key - ngx_current_msec) <= 0) { |
99 ev = (ngx_event_t *) ((char *) node - offsetof(ngx_event_t, timer)); | 99 ev = (ngx_event_t *) ((char *) node - offsetof(ngx_event_t, timer)); |
100 | 100 |
101 #if (NGX_THREADS) | |
102 | |
103 if (ngx_threaded && ngx_trylock(ev->lock) == 0) { | |
104 | |
105 /* | |
106 * We cannot change the timer of the event that is being | |
107 * handled by another thread. And we cannot easy walk | |
108 * the rbtree to find next expired timer so we exit the loop. | |
109 * However, it should be a rare case when the event that is | |
110 * being handled has an expired timer. | |
111 */ | |
112 | |
113 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0, | |
114 "event %p is busy in expire timers", ev); | |
115 break; | |
116 } | |
117 #endif | |
118 | |
119 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0, | 101 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0, |
120 "event timer del: %d: %M", | 102 "event timer del: %d: %M", |
121 ngx_event_ident(ev->data), ev->timer.key); | 103 ngx_event_ident(ev->data), ev->timer.key); |
122 | 104 |
123 ngx_rbtree_delete(&ngx_event_timer_rbtree, &ev->timer); | 105 ngx_rbtree_delete(&ngx_event_timer_rbtree, &ev->timer); |
130 ev->timer.parent = NULL; | 112 ev->timer.parent = NULL; |
131 #endif | 113 #endif |
132 | 114 |
133 ev->timer_set = 0; | 115 ev->timer_set = 0; |
134 | 116 |
135 #if (NGX_THREADS) | |
136 if (ngx_threaded) { | |
137 ev->posted_timedout = 1; | |
138 | |
139 ngx_post_event(ev, &ngx_posted_events); | |
140 | |
141 ngx_unlock(ev->lock); | |
142 | |
143 continue; | |
144 } | |
145 #endif | |
146 | |
147 ev->timedout = 1; | 117 ev->timedout = 1; |
148 | 118 |
149 ev->handler(ev); | 119 ev->handler(ev); |
150 | 120 |
151 continue; | 121 continue; |