Mercurial > hg > nginx

changeset 6109:d588dda5ec31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
+++ b/src/core/ngx_regex.c
@@ -80,17 +80,6 @@ ngx_regex_init(void)
 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 @@ ngx_regex_malloc_init(ngx_pool_t *pool)
 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 @@ static void * ngx_libc_cdecl
 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
+++ b/src/os/win32/ngx_process_cycle.c
@@ -31,7 +31,6 @@ static ngx_thread_value_t __stdcall ngx_
 
 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
+++ b/src/os/win32/ngx_process_cycle.h
@@ -26,7 +26,6 @@ void ngx_close_handle(HANDLE h);
 
 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;