diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-03-02 15:40:59 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-03-02 15:40:59 +0000 |
| commit | ea0b1d973c975d8f61aad1198ae391e8eba1c8b9 (patch) | |
| tree | 1eb7b0375243c66af086ab630688780bfe1313bd /src | |
| parent | b9956ee298d6feed24be23b287f607ed4707ed63 (diff) | |
| download | nginx-ea0b1d973c975d8f61aad1198ae391e8eba1c8b9.tar.gz nginx-ea0b1d973c975d8f61aad1198ae391e8eba1c8b9.zip | |
nginx-0.0.2-2004-03-02-18:40:59 import
Diffstat (limited to 'src')
| -rw-r--r-- | src/event/ngx_event_timer.c | 4 | ||||
| -rw-r--r-- | src/event/ngx_event_timer.h | 4 | ||||
| -rw-r--r-- | src/os/unix/ngx_thread.h | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c index 8983d997b..79a2e195d 100644 --- 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) diff --git a/src/event/ngx_event_timer.h b/src/event/ngx_event_timer.h index 568a97c0a..21f261f88 100644 --- 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_mutex; #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) diff --git a/src/os/unix/ngx_thread.h b/src/os/unix/ngx_thread.h index 8a02880bb..0b065d8ec 100644 --- 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" |