Mercurial > hg > nginx
changeset 275:b836469c37c3
nginx-0.0.2-2004-03-02-18:40:59 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 02 Mar 2004 15:40:59 +0000 |
parents | a1ea1ecc3eac |
children | a2d1ccc96111 |
files | auto/configure src/event/ngx_event_timer.c src/event/ngx_event_timer.h src/os/unix/ngx_thread.h |
diffstat | 4 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/event/ngx_event_timer.c +++ b/src/event/ngx_event_timer.c @@ -9,8 +9,8 @@ ngx_mutex_t *ngx_event_timer_mutex; #endif -volatile ngx_rbtree_t *ngx_event_timer_rbtree; -ngx_rbtree_t ngx_event_timer_sentinel; +ngx_thread_volatile ngx_rbtree_t *ngx_event_timer_rbtree; +ngx_rbtree_t ngx_event_timer_sentinel; ngx_int_t ngx_event_timer_init(ngx_log_t *log)
--- a/src/event/ngx_event_timer.h +++ b/src/event/ngx_event_timer.h @@ -31,8 +31,8 @@ extern ngx_mutex_t *ngx_event_timer_mut #endif -extern volatile ngx_rbtree_t *ngx_event_timer_rbtree; -extern ngx_rbtree_t ngx_event_timer_sentinel; +extern ngx_thread_volatile ngx_rbtree_t *ngx_event_timer_rbtree; +extern ngx_rbtree_t ngx_event_timer_sentinel; ngx_inline static void ngx_event_del_timer(ngx_event_t *ev)
--- a/src/os/unix/ngx_thread.h +++ b/src/os/unix/ngx_thread.h @@ -7,6 +7,8 @@ #if (NGX_THREADS) +#define ngx_thread_volatile volatile + #if (NGX_USE_RFORK) #include <sys/ipc.h> @@ -96,6 +98,8 @@ extern ngx_int_t ngx_threaded; #else /* !NGX_THREADS */ +#define ngx_thread_volatile + #define ngx_log_tid 0 #define TID_T_FMT "%d"