mirror of
https://github.com/nginx/nginx.git
synced 2025-06-07 17:52:38 +08:00
Removed ngx_threaded and related code.
This commit is contained in:
parent
7c44e39220
commit
2b0d2f0583
@ -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);
|
||||
}
|
||||
|
@ -31,7 +31,6 @@ static ngx_thread_value_t __stdcall ngx_cache_loader_thread(void *data);
|
||||
|
||||
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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user