mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-08 10:12:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed ngx_threaded and related code.

Browse Source
This commit is contained in:
Ruslan Ermilov 2015-03-26 14:15:13 +03:00
parent 7c44e39220
commit 2b0d2f0583
3 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/core/ngx_regex.c
View File

@ -80,17 +80,6 @@ ngx_regex_init(void)
static ngx_inline void static ngx_inline void
ngx_regex_malloc_init(ngx_pool_t *pool) 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; ngx_pcre_pool = pool;
} }
@ -98,17 +87,6 @@ ngx_regex_malloc_init(ngx_pool_t *pool)
static ngx_inline void static ngx_inline void
ngx_regex_malloc_done(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; ngx_pcre_pool = NULL;
} }
@ -253,22 +231,7 @@ static void * ngx_libc_cdecl
ngx_regex_malloc(size_t size) ngx_regex_malloc(size_t size)
{ {
ngx_pool_t *pool; 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; pool = ngx_pcre_pool;
}
#else
pool = ngx_pcre_pool;
#endif
if (pool) { if (pool) {
return ngx_palloc(pool, size); return ngx_palloc(pool, size);

1
src/os/win32/ngx_process_cycle.c
View File

@ -31,7 +31,6 @@ static ngx_thread_value_t __stdcall ngx_cache_loader_thread(void *data);
ngx_uint_t ngx_process; ngx_uint_t ngx_process;
ngx_pid_t ngx_pid; ngx_pid_t ngx_pid;
ngx_uint_t ngx_threaded;
ngx_uint_t ngx_inherited; ngx_uint_t ngx_inherited;
ngx_pid_t ngx_new_binary; ngx_pid_t ngx_new_binary;

1
src/os/win32/ngx_process_cycle.h
View File

@ -26,7 +26,6 @@ void ngx_close_handle(HANDLE h);
extern ngx_uint_t ngx_process; extern ngx_uint_t ngx_process;
extern ngx_pid_t ngx_pid; extern ngx_pid_t ngx_pid;
extern ngx_uint_t ngx_threaded;
extern ngx_uint_t ngx_exiting; extern ngx_uint_t ngx_exiting;
extern sig_atomic_t ngx_quit; extern sig_atomic_t ngx_quit;