mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-02 20:09:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renamed NGX_THREADS to NGX_OLD_THREADS because of deprecation.

Browse Source 
It's mostly dead code and the original idea of worker threads has been rejected.
This commit is contained in:
Ruslan Ermilov 2015-03-04 18:26:25 +03:00
parent b89e3bc034
commit 83ba5ed2ec
19 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/nginx.c
View File

@ -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;

2
src/core/ngx_connection.c
View File

@ -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

2
src/core/ngx_connection.h
View File

@ -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
};

2
src/core/ngx_cycle.c
View File

@ -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

8
src/core/ngx_cycle.h
View File

@ -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

6
src/core/ngx_regex.c
View File

@ -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) {

2
src/core/ngx_spinlock.c
View File

@ -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 !

6
src/event/modules/ngx_kqueue_module.c
View File

@ -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

2
src/event/modules/ngx_poll_module.c
View File

@ -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");

2
src/event/modules/ngx_select_module.c
View File

@ -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");

4
src/event/ngx_event.c
View File

@ -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);

2
src/event/ngx_event_busy_lock.h
View File

@ -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;

2
src/event/ngx_event_connect.h
View File

@ -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

2
src/event/ngx_event_mutex.c
View File

@ -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

2
src/http/ngx_http_upstream.c
View File

@ -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

10
src/os/unix/ngx_process_cycle.c
View File

@ -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)

4
src/os/unix/ngx_thread.h
View File

@ -12,7 +12,7 @@
#include <ngx_config.h>
#include <ngx_core.h>
#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

8
src/os/unix/ngx_user.c
View File

@ -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

2
src/os/win32/ngx_win32_config.h
View File

@ -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