Mercurial > hg > nginx

comparison src/event/ngx_event_timer.h @ 5894:1f513d7f1b45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Events: removed broken thread support from event timers. 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, 25 Aug 2014 13:34:39 +0400
parents d620f497c50f
children 3efdd7788bb0
comparison
equal deleted inserted replaced
5893:fa4161fe8254 5894:1f513d7f1b45
22 ngx_int_t ngx_event_timer_init(ngx_log_t *log); 22 ngx_int_t ngx_event_timer_init(ngx_log_t *log);
23 ngx_msec_t ngx_event_find_timer(void); 23 ngx_msec_t ngx_event_find_timer(void);
24 void ngx_event_expire_timers(void); 24 void ngx_event_expire_timers(void);
25 25
26 26
27 #if (NGX_THREADS) 27 extern ngx_rbtree_t ngx_event_timer_rbtree;
28 extern ngx_mutex_t *ngx_event_timer_mutex;
29 #endif
30
31
32 extern ngx_thread_volatile ngx_rbtree_t ngx_event_timer_rbtree;
33 28
34 29
35 static ngx_inline void 30 static ngx_inline void
36 ngx_event_del_timer(ngx_event_t *ev) 31 ngx_event_del_timer(ngx_event_t *ev)
37 { 32 {
38 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0, 33 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
39 "event timer del: %d: %M", 34 "event timer del: %d: %M",
40 ngx_event_ident(ev->data), ev->timer.key); 35 ngx_event_ident(ev->data), ev->timer.key);
41 36
42 ngx_mutex_lock(ngx_event_timer_mutex);
43
44 ngx_rbtree_delete(&ngx_event_timer_rbtree, &ev->timer); 37 ngx_rbtree_delete(&ngx_event_timer_rbtree, &ev->timer);
45
46 ngx_mutex_unlock(ngx_event_timer_mutex);
47 38
48 #if (NGX_DEBUG) 39 #if (NGX_DEBUG)
49 ev->timer.left = NULL; 40 ev->timer.left = NULL;
50 ev->timer.right = NULL; 41 ev->timer.right = NULL;
51 ev->timer.parent = NULL; 42 ev->timer.parent = NULL;
87 78
88 ngx_log_debug3(NGX_LOG_DEBUG_EVENT, ev->log, 0, 79 ngx_log_debug3(NGX_LOG_DEBUG_EVENT, ev->log, 0,
89 "event timer add: %d: %M:%M", 80 "event timer add: %d: %M:%M",
90 ngx_event_ident(ev->data), timer, ev->timer.key); 81 ngx_event_ident(ev->data), timer, ev->timer.key);
91 82
92 ngx_mutex_lock(ngx_event_timer_mutex);
93
94 ngx_rbtree_insert(&ngx_event_timer_rbtree, &ev->timer); 83 ngx_rbtree_insert(&ngx_event_timer_rbtree, &ev->timer);
95
96 ngx_mutex_unlock(ngx_event_timer_mutex);
97 84
98 ev->timer_set = 1; 85 ev->timer_set = 1;
99 } 86 }
100 87
101 88