From 83ba5ed2ecc1ca06971639e4e2c7325aaa8e5101 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Wed, 4 Mar 2015 18:26:25 +0300 Subject: [PATCH] Renamed NGX_THREADS to NGX_OLD_THREADS because of deprecation. It's mostly dead code and the original idea of worker threads has been rejected. --- src/core/nginx.c | 6 +++--- src/core/ngx_connection.c | 2 +- src/core/ngx_connection.h | 2 +- src/core/ngx_cycle.c | 2 +- src/core/ngx_cycle.h | 8 ++++++-- src/core/ngx_regex.c | 6 +++--- src/core/ngx_spinlock.c | 2 +- src/event/modules/ngx_kqueue_module.c | 6 +++--- src/event/modules/ngx_poll_module.c | 2 +- src/event/modules/ngx_select_module.c | 2 +- src/event/ngx_event.c | 4 ++-- src/event/ngx_event_busy_lock.h | 2 +- src/event/ngx_event_connect.h | 2 +- src/event/ngx_event_mutex.c | 2 +- src/http/ngx_http_upstream.c | 2 +- src/os/unix/ngx_process_cycle.c | 10 +++++----- src/os/unix/ngx_thread.h | 4 ++-- src/os/unix/ngx_user.c | 8 ++++---- src/os/win32/ngx_win32_config.h | 2 +- 19 files changed, 39 insertions(+), 35 deletions(-) diff --git a/src/core/nginx.c b/src/core/nginx.c index c75ee4fd7..feb861a11 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -139,7 +139,7 @@ static ngx_command_t ngx_core_commands[] = { 0, NULL }, -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) { ngx_string("worker_threads"), NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, @@ -959,7 +959,7 @@ ngx_core_module_create_conf(ngx_cycle_t *cycle) ccf->user = (ngx_uid_t) NGX_CONF_UNSET_UINT; ccf->group = (ngx_gid_t) NGX_CONF_UNSET_UINT; -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) ccf->worker_threads = NGX_CONF_UNSET; ccf->thread_stack_size = NGX_CONF_UNSET_SIZE; #endif @@ -1000,7 +1000,7 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf) #endif -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) ngx_conf_init_value(ccf->worker_threads, 0); ngx_threads_n = ccf->worker_threads; diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index d6c0bdadc..896b775c5 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -943,7 +943,7 @@ ngx_close_connection(ngx_connection_t *c) } } -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) /* * we have to clean the connection information before the closing diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h index 143cab7b3..207aea4f5 100644 --- a/src/core/ngx_connection.h +++ b/src/core/ngx_connection.h @@ -184,7 +184,7 @@ struct ngx_connection_s { unsigned busy_count:2; #endif -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) ngx_atomic_t lock; #endif }; diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index d69783fec..11e413f4e 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -26,7 +26,7 @@ static ngx_event_t ngx_cleaner_event; ngx_uint_t ngx_test_config; ngx_uint_t ngx_quiet_mode; -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) ngx_tls_key_t ngx_core_tls_key; #endif diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h index 21bf5ca3f..be90a7281 100644 --- a/src/core/ngx_cycle.h +++ b/src/core/ngx_cycle.h @@ -103,7 +103,7 @@ typedef struct { ngx_array_t env; char **environment; -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) ngx_int_t worker_threads; size_t thread_stack_size; #endif @@ -111,10 +111,14 @@ typedef struct { } ngx_core_conf_t; +#if (NGX_OLD_THREADS) + typedef struct { ngx_pool_t *pool; /* pcre's malloc() pool */ } ngx_core_tls_t; +#endif + #define ngx_is_init_cycle(cycle) (cycle->conf_ctx == NULL) @@ -136,7 +140,7 @@ extern ngx_array_t ngx_old_cycles; extern ngx_module_t ngx_core_module; extern ngx_uint_t ngx_test_config; extern ngx_uint_t ngx_quiet_mode; -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) extern ngx_tls_key_t ngx_core_tls_key; #endif diff --git a/src/core/ngx_regex.c b/src/core/ngx_regex.c index 30acca5fc..77c5947de 100644 --- a/src/core/ngx_regex.c +++ b/src/core/ngx_regex.c @@ -80,7 +80,7 @@ ngx_regex_init(void) static ngx_inline void ngx_regex_malloc_init(ngx_pool_t *pool) { -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) ngx_core_tls_t *tls; if (ngx_threaded) { @@ -98,7 +98,7 @@ ngx_regex_malloc_init(ngx_pool_t *pool) static ngx_inline void ngx_regex_malloc_done(void) { -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) ngx_core_tls_t *tls; if (ngx_threaded) { @@ -253,7 +253,7 @@ static void * ngx_libc_cdecl ngx_regex_malloc(size_t size) { ngx_pool_t *pool; -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) ngx_core_tls_t *tls; if (ngx_threaded) { diff --git a/src/core/ngx_spinlock.c b/src/core/ngx_spinlock.c index 9c93afaf1..33477e2ee 100644 --- a/src/core/ngx_spinlock.c +++ b/src/core/ngx_spinlock.c @@ -42,7 +42,7 @@ ngx_spinlock(ngx_atomic_t *lock, ngx_atomic_int_t value, ngx_uint_t spin) #else -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) #error ngx_spinlock() or ngx_atomic_cmp_set() are not defined ! diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c index 9e7a1bdb6..17214c5fb 100644 --- a/src/event/modules/ngx_kqueue_module.c +++ b/src/event/modules/ngx_kqueue_module.c @@ -48,7 +48,7 @@ static struct kevent *change_list, *change_list0, *change_list1; static struct kevent *event_list; static ngx_uint_t max_changes, nchanges, nevents; -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) static ngx_mutex_t *list_mutex; static ngx_mutex_t *kevent_mutex; #endif @@ -133,7 +133,7 @@ ngx_kqueue_init(ngx_cycle_t *cycle, ngx_msec_t timer) return NGX_ERROR; } -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) list_mutex = ngx_mutex_init(cycle->log, 0); if (list_mutex == NULL) { @@ -257,7 +257,7 @@ ngx_kqueue_done(ngx_cycle_t *cycle) ngx_kqueue = -1; -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) ngx_mutex_destroy(kevent_mutex); ngx_mutex_destroy(list_mutex); #endif diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c index bad1a7d2a..3617afb95 100644 --- a/src/event/modules/ngx_poll_module.c +++ b/src/event/modules/ngx_poll_module.c @@ -413,7 +413,7 @@ ngx_poll_init_conf(ngx_cycle_t *cycle, void *conf) return NGX_CONF_OK; } -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) ngx_log_error(NGX_LOG_EMERG, cycle->log, 0, "poll() is not supported in the threaded mode"); diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c index fa2d55ae2..e83744431 100644 --- a/src/event/modules/ngx_select_module.c +++ b/src/event/modules/ngx_select_module.c @@ -419,7 +419,7 @@ ngx_select_init_conf(ngx_cycle_t *cycle, void *conf) return NGX_CONF_ERROR; } -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) ngx_log_error(NGX_LOG_EMERG, cycle->log, 0, "select() is not supported in the threaded mode"); diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c index 26c3b9716..885528aae 100644 --- a/src/event/ngx_event.c +++ b/src/event/ngx_event.c @@ -212,7 +212,7 @@ ngx_process_events_and_timers(ngx_cycle_t *cycle) timer = ngx_event_find_timer(); flags = NGX_UPDATE_TIME; -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) if (timer == NGX_TIMER_INFINITE || timer > 500) { timer = 500; @@ -722,7 +722,7 @@ ngx_event_process_init(ngx_cycle_t *cycle) next = &c[i]; -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) c[i].lock = 0; #endif } while (i); diff --git a/src/event/ngx_event_busy_lock.h b/src/event/ngx_event_busy_lock.h index 254c233e7..a7e556cf6 100644 --- a/src/event/ngx_event_busy_lock.h +++ b/src/event/ngx_event_busy_lock.h @@ -46,7 +46,7 @@ typedef struct { ngx_event_busy_lock_ctx_t *events; ngx_event_busy_lock_ctx_t *last; -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) ngx_mutex_t *mutex; #endif } ngx_event_busy_lock_t; diff --git a/src/event/ngx_event_connect.h b/src/event/ngx_event_connect.h index e73825885..ab35836a2 100644 --- a/src/event/ngx_event_connect.h +++ b/src/event/ngx_event_connect.h @@ -53,7 +53,7 @@ struct ngx_peer_connection_s { ngx_event_save_peer_session_pt save_session; #endif -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) ngx_atomic_t *lock; #endif diff --git a/src/event/ngx_event_mutex.c b/src/event/ngx_event_mutex.c index 98efbb0d8..66befe3b6 100644 --- a/src/event/ngx_event_mutex.c +++ b/src/event/ngx_event_mutex.c @@ -28,7 +28,7 @@ ngx_int_t ngx_event_mutex_timedlock(ngx_event_mutex_t *m, ngx_msec_t timer, m->last = ev; ev->next = NULL; -#if (NGX_THREADS0) +#if (NGX_OLD_THREADS0) ev->light = 1; #endif diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 701978139..fcff4a4c3 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -446,7 +446,7 @@ ngx_http_upstream_create(ngx_http_request_t *r) u->peer.log = r->connection->log; u->peer.log_error = NGX_ERROR_ERR; -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) u->peer.lock = &r->connection->lock; #endif diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c index 51cf72544..83d65dde6 100644 --- a/src/os/unix/ngx_process_cycle.c +++ b/src/os/unix/ngx_process_cycle.c @@ -23,7 +23,7 @@ static void ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data); static void ngx_worker_process_init(ngx_cycle_t *cycle, ngx_int_t worker); static void ngx_worker_process_exit(ngx_cycle_t *cycle); static void ngx_channel_handler(ngx_event_t *ev); -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) static void ngx_wakeup_worker_threads(ngx_cycle_t *cycle); static ngx_thread_value_t ngx_worker_thread_cycle(void *data); #endif @@ -56,7 +56,7 @@ ngx_uint_t ngx_noaccepting; ngx_uint_t ngx_restart; -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) volatile ngx_thread_t ngx_threads[NGX_MAX_THREADS]; ngx_int_t ngx_threads_n; #endif @@ -747,7 +747,7 @@ ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data) ngx_setproctitle("worker process"); -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) { ngx_int_t n; ngx_err_t err; @@ -1032,7 +1032,7 @@ ngx_worker_process_exit(ngx_cycle_t *cycle) ngx_uint_t i; ngx_connection_t *c; -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) ngx_terminate = 1; ngx_wakeup_worker_threads(cycle); @@ -1181,7 +1181,7 @@ ngx_channel_handler(ngx_event_t *ev) } -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) static void ngx_wakeup_worker_threads(ngx_cycle_t *cycle) diff --git a/src/os/unix/ngx_thread.h b/src/os/unix/ngx_thread.h index 49c5d5656..2077b3df6 100644 --- a/src/os/unix/ngx_thread.h +++ b/src/os/unix/ngx_thread.h @@ -12,7 +12,7 @@ #include #include -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) #define NGX_MAX_THREADS 128 @@ -107,7 +107,7 @@ ngx_int_t ngx_cond_wait(ngx_cond_t *cv, ngx_mutex_t *m); ngx_int_t ngx_cond_signal(ngx_cond_t *cv); -#else /* !NGX_THREADS */ +#else /* !NGX_OLD_THREADS */ #define ngx_thread_volatile diff --git a/src/os/unix/ngx_user.c b/src/os/unix/ngx_user.c index 3491f1c9e..4ac969fd9 100644 --- a/src/os/unix/ngx_user.c +++ b/src/os/unix/ngx_user.c @@ -64,7 +64,7 @@ ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) size_t len; ngx_err_t err; -#if (NGX_THREADS && NGX_NONREENTRANT_CRYPT) +#if (NGX_OLD_THREADS && NGX_NONREENTRANT_CRYPT) /* crypt() is a time consuming function, so we only try to lock */ @@ -81,14 +81,14 @@ ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) *encrypted = ngx_pnalloc(pool, len); if (*encrypted == NULL) { -#if (NGX_THREADS && NGX_NONREENTRANT_CRYPT) +#if (NGX_OLD_THREADS && NGX_NONREENTRANT_CRYPT) ngx_mutex_unlock(ngx_crypt_mutex); #endif return NGX_ERROR; } ngx_memcpy(*encrypted, value, len); -#if (NGX_THREADS && NGX_NONREENTRANT_CRYPT) +#if (NGX_OLD_THREADS && NGX_NONREENTRANT_CRYPT) ngx_mutex_unlock(ngx_crypt_mutex); #endif return NGX_OK; @@ -96,7 +96,7 @@ ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) err = ngx_errno; -#if (NGX_THREADS && NGX_NONREENTRANT_CRYPT) +#if (NGX_OLD_THREADS && NGX_NONREENTRANT_CRYPT) ngx_mutex_unlock(ngx_crypt_mutex); #endif diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h index 098ca24c0..f4b2eea31 100644 --- a/src/os/win32/ngx_win32_config.h +++ b/src/os/win32/ngx_win32_config.h @@ -218,7 +218,7 @@ typedef int sig_atomic_t; #define NGX_HAVE_LITTLE_ENDIAN 1 #define NGX_HAVE_NONALIGNED 1 -#define NGX_THREADS 1 +#define NGX_OLD_THREADS 1 #define NGX_WIN_NT 200000