Mercurial > hg > nginx

comparison src/core/ngx_regex.c @ 6016:457ec43dd8d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Renamed NGX_THREADS to NGX_OLD_THREADS because of deprecation. It's mostly dead code and the original idea of worker threads has been rejected.
author Ruslan Ermilov <ru@nginx.com>
date Wed, 04 Mar 2015 18:26:25 +0300
parents e7f6991eca47
children d588dda5ec31
comparison
equal deleted inserted replaced
6015:e11a8e7e8e0c 6016:457ec43dd8d5
78 78
79 79
80 static ngx_inline void 80 static ngx_inline void
81 ngx_regex_malloc_init(ngx_pool_t *pool) 81 ngx_regex_malloc_init(ngx_pool_t *pool)
82 { 82 {
83 #if (NGX_THREADS) 83 #if (NGX_OLD_THREADS)
84 ngx_core_tls_t *tls; 84 ngx_core_tls_t *tls;
85 85
86 if (ngx_threaded) { 86 if (ngx_threaded) {
87 tls = ngx_thread_get_tls(ngx_core_tls_key); 87 tls = ngx_thread_get_tls(ngx_core_tls_key);
88 tls->pool = pool; 88 tls->pool = pool;
96 96
97 97
98 static ngx_inline void 98 static ngx_inline void
99 ngx_regex_malloc_done(void) 99 ngx_regex_malloc_done(void)
100 { 100 {
101 #if (NGX_THREADS) 101 #if (NGX_OLD_THREADS)
102 ngx_core_tls_t *tls; 102 ngx_core_tls_t *tls;
103 103
104 if (ngx_threaded) { 104 if (ngx_threaded) {
105 tls = ngx_thread_get_tls(ngx_core_tls_key); 105 tls = ngx_thread_get_tls(ngx_core_tls_key);
106 tls->pool = NULL; 106 tls->pool = NULL;
251 251
252 static void * ngx_libc_cdecl 252 static void * ngx_libc_cdecl
253 ngx_regex_malloc(size_t size) 253 ngx_regex_malloc(size_t size)
254 { 254 {
255 ngx_pool_t *pool; 255 ngx_pool_t *pool;
256 #if (NGX_THREADS) 256 #if (NGX_OLD_THREADS)
257 ngx_core_tls_t *tls; 257 ngx_core_tls_t *tls;
258 258
259 if (ngx_threaded) { 259 if (ngx_threaded) {
260 tls = ngx_thread_get_tls(ngx_core_tls_key); 260 tls = ngx_thread_get_tls(ngx_core_tls_key);
261 pool = tls->pool; 261 pool = tls->pool;