diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2014-08-25 13:34:39 +0400 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2014-08-25 13:34:39 +0400 |
| commit | 246152c864a7136cc81abe6d2c5926288748d65c (patch) | |
| tree | 9a95e82f5e137b9591cc1024becae02d9ce0b913 /src/event/ngx_event_timer.h | |
| parent | 2d16e3c3a1f56b0a424a1052bfc82737f5208db3 (diff) | |
| download | nginx-246152c864a7136cc81abe6d2c5926288748d65c.tar.gz nginx-246152c864a7136cc81abe6d2c5926288748d65c.tar.bz2 | |
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.
Diffstat (limited to 'src/event/ngx_event_timer.h')
| -rw-r--r-- | src/event/ngx_event_timer.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/event/ngx_event_timer.h b/src/event/ngx_event_timer.h index ec9b316bd..df55d3cd6 100644 --- a/src/event/ngx_event_timer.h +++ b/src/event/ngx_event_timer.h @@ -24,12 +24,7 @@ ngx_msec_t ngx_event_find_timer(void); void ngx_event_expire_timers(void); -#if (NGX_THREADS) -extern ngx_mutex_t *ngx_event_timer_mutex; -#endif - - -extern ngx_thread_volatile ngx_rbtree_t ngx_event_timer_rbtree; +extern ngx_rbtree_t ngx_event_timer_rbtree; static ngx_inline void @@ -39,12 +34,8 @@ ngx_event_del_timer(ngx_event_t *ev) "event timer del: %d: %M", ngx_event_ident(ev->data), ev->timer.key); - ngx_mutex_lock(ngx_event_timer_mutex); - ngx_rbtree_delete(&ngx_event_timer_rbtree, &ev->timer); - ngx_mutex_unlock(ngx_event_timer_mutex); - #if (NGX_DEBUG) ev->timer.left = NULL; ev->timer.right = NULL; @@ -89,12 +80,8 @@ ngx_event_add_timer(ngx_event_t *ev, ngx_msec_t timer) "event timer add: %d: %M:%M", ngx_event_ident(ev->data), timer, ev->timer.key); - ngx_mutex_lock(ngx_event_timer_mutex); - ngx_rbtree_insert(&ngx_event_timer_rbtree, &ev->timer); - ngx_mutex_unlock(ngx_event_timer_mutex); - ev->timer_set = 1; } |