diff options
| -rw-r--r-- | src/core/ngx_cycle.c | 4 | ||||
| -rw-r--r-- | src/core/ngx_cycle.h | 12 | ||||
| -rw-r--r-- | src/os/win32/ngx_process_cycle.c | 9 | ||||
| -rw-r--r-- | src/os/win32/ngx_thread.c | 24 | ||||
| -rw-r--r-- | src/os/win32/ngx_thread.h | 7 |
5 files changed, 0 insertions, 56 deletions
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index 4646978f7..e9dfdfc2a 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -26,10 +26,6 @@ static ngx_event_t ngx_cleaner_event; ngx_uint_t ngx_test_config; ngx_uint_t ngx_quiet_mode; -#if (NGX_OLD_THREADS) -ngx_tls_key_t ngx_core_tls_key; -#endif - /* STUB NAME */ static ngx_connection_t dumb; diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h index 28f1886cc..ba876867f 100644 --- a/src/core/ngx_cycle.h +++ b/src/core/ngx_cycle.h @@ -112,15 +112,6 @@ 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) @@ -141,9 +132,6 @@ 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_OLD_THREADS) -extern ngx_tls_key_t ngx_core_tls_key; -#endif #endif /* _NGX_CYCLE_H_INCLUDED_ */ diff --git a/src/os/win32/ngx_process_cycle.c b/src/os/win32/ngx_process_cycle.c index 343528237..20ad51452 100644 --- a/src/os/win32/ngx_process_cycle.c +++ b/src/os/win32/ngx_process_cycle.c @@ -253,7 +253,6 @@ ngx_master_process_cycle(ngx_cycle_t *cycle) static void ngx_process_init(ngx_cycle_t *cycle) { - ngx_err_t err; ngx_core_conf_t *ccf; ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module); @@ -264,14 +263,6 @@ ngx_process_init(ngx_cycle_t *cycle) /* fatal */ exit(2); } - - err = ngx_thread_key_create(&ngx_core_tls_key); - if (err != 0) { - ngx_log_error(NGX_LOG_ALERT, cycle->log, err, - ngx_thread_key_create_n " failed"); - /* fatal */ - exit(2); - } } diff --git a/src/os/win32/ngx_thread.c b/src/os/win32/ngx_thread.c index 3255e0155..556ca6c9b 100644 --- a/src/os/win32/ngx_thread.c +++ b/src/os/win32/ngx_thread.c @@ -43,27 +43,3 @@ ngx_init_threads(int n, size_t size, ngx_cycle_t *cycle) return NGX_OK; } - - -ngx_err_t -ngx_thread_key_create(ngx_tls_key_t *key) -{ - *key = TlsAlloc(); - - if (*key == TLS_OUT_OF_INDEXES) { - return ngx_errno; - } - - return 0; -} - - -ngx_err_t -ngx_thread_set_tls(ngx_tls_key_t *key, void *data) -{ - if (TlsSetValue(*key, data) == 0) { - return ngx_errno; - } - - return 0; -} diff --git a/src/os/win32/ngx_thread.h b/src/os/win32/ngx_thread.h index e1d0a7eae..7d7052b22 100644 --- a/src/os/win32/ngx_thread.h +++ b/src/os/win32/ngx_thread.h @@ -14,7 +14,6 @@ typedef HANDLE ngx_tid_t; -typedef DWORD ngx_tls_key_t; typedef DWORD ngx_thread_value_t; @@ -22,12 +21,6 @@ ngx_err_t ngx_create_thread(ngx_tid_t *tid, ngx_thread_value_t (__stdcall *func)(void *arg), void *arg, ngx_log_t *log); ngx_int_t ngx_init_threads(int n, size_t size, ngx_cycle_t *cycle); -ngx_err_t ngx_thread_key_create(ngx_tls_key_t *key); -#define ngx_thread_key_create_n "TlsAlloc()" -ngx_err_t ngx_thread_set_tls(ngx_tls_key_t *key, void *data); -#define ngx_thread_set_tls_n "TlsSetValue()" -#define ngx_thread_get_tls TlsGetValue - #define ngx_log_tid GetCurrentThreadId() #define NGX_TID_T_FMT "%ud" |