Mercurial > hg > nginx
changeset 6109:d588dda5ec31
Removed ngx_threaded and related code.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Thu, 26 Mar 2015 14:15:13 +0300 |
parents | 55dc5f7eb921 |
children | 16c51e80128c |
files | src/core/ngx_regex.c src/os/win32/ngx_process_cycle.c src/os/win32/ngx_process_cycle.h |
diffstat | 3 files changed, 0 insertions(+), 39 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_regex.c Thu Apr 16 20:09:11 2015 +0300 +++ b/src/core/ngx_regex.c Thu Mar 26 14:15:13 2015 +0300 @@ -80,17 +80,6 @@ static ngx_inline void ngx_regex_malloc_init(ngx_pool_t *pool) { -#if (NGX_OLD_THREADS) - ngx_core_tls_t *tls; - - if (ngx_threaded) { - tls = ngx_thread_get_tls(ngx_core_tls_key); - tls->pool = pool; - return; - } - -#endif - ngx_pcre_pool = pool; } @@ -98,17 +87,6 @@ static ngx_inline void ngx_regex_malloc_done(void) { -#if (NGX_OLD_THREADS) - ngx_core_tls_t *tls; - - if (ngx_threaded) { - tls = ngx_thread_get_tls(ngx_core_tls_key); - tls->pool = NULL; - return; - } - -#endif - ngx_pcre_pool = NULL; } @@ -253,23 +231,8 @@ ngx_regex_malloc(size_t size) { ngx_pool_t *pool; -#if (NGX_OLD_THREADS) - ngx_core_tls_t *tls; - - if (ngx_threaded) { - tls = ngx_thread_get_tls(ngx_core_tls_key); - pool = tls->pool; - - } else { - pool = ngx_pcre_pool; - } - -#else - pool = ngx_pcre_pool; -#endif - if (pool) { return ngx_palloc(pool, size); }
--- a/src/os/win32/ngx_process_cycle.c Thu Apr 16 20:09:11 2015 +0300 +++ b/src/os/win32/ngx_process_cycle.c Thu Mar 26 14:15:13 2015 +0300 @@ -31,7 +31,6 @@ ngx_uint_t ngx_process; ngx_pid_t ngx_pid; -ngx_uint_t ngx_threaded; ngx_uint_t ngx_inherited; ngx_pid_t ngx_new_binary;
--- a/src/os/win32/ngx_process_cycle.h Thu Apr 16 20:09:11 2015 +0300 +++ b/src/os/win32/ngx_process_cycle.h Thu Mar 26 14:15:13 2015 +0300 @@ -26,7 +26,6 @@ extern ngx_uint_t ngx_process; extern ngx_pid_t ngx_pid; -extern ngx_uint_t ngx_threaded; extern ngx_uint_t ngx_exiting; extern sig_atomic_t ngx_quit;