aboutsummaryrefslogtreecommitdiff
path: root/src/core/ngx_regex.c
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@nginx.com>2015-03-26 14:15:13 +0300
committerRuslan Ermilov <ru@nginx.com>2015-03-26 14:15:13 +0300
commit2b0d2f058315baf61b20040e18df147d3816ff38 (patch)
tree542a3b1d37505a30dc961852df04672b920ac5bc /src/core/ngx_regex.c
parent7c44e3922017de131e419d58b4346cd70e667ce8 (diff)
downloadnginx-2b0d2f058315baf61b20040e18df147d3816ff38.tar.gz
nginx-2b0d2f058315baf61b20040e18df147d3816ff38.zip
Removed ngx_threaded and related code.
Diffstat (limited to 'src/core/ngx_regex.c')
-rw-r--r--src/core/ngx_regex.c37
1 files changed, 0 insertions, 37 deletions
diff --git a/src/core/ngx_regex.c b/src/core/ngx_regex.c
index 77c5947de..416622dcc 100644
--- 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);
}