Mercurial > hg > nginx-quic

comparison src/core/ngx_cycle.h @ 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 d8af1005e886
children 79ddb0bdb273
comparison
equal deleted inserted replaced
6015:e11a8e7e8e0c 6016:457ec43dd8d5
101 ngx_str_t oldpid; 101 ngx_str_t oldpid;
102 102
103 ngx_array_t env; 103 ngx_array_t env;
104 char **environment; 104 char **environment;
105 105
106 #if (NGX_THREADS) 106 #if (NGX_OLD_THREADS)
107 ngx_int_t worker_threads; 107 ngx_int_t worker_threads;
108 size_t thread_stack_size; 108 size_t thread_stack_size;
109 #endif 109 #endif
110 110
111 } ngx_core_conf_t; 111 } ngx_core_conf_t;
112 112
113 113
114 #if (NGX_OLD_THREADS)
115
114 typedef struct { 116 typedef struct {
115 ngx_pool_t *pool; /* pcre's malloc() pool */ 117 ngx_pool_t *pool; /* pcre's malloc() pool */
116 } ngx_core_tls_t; 118 } ngx_core_tls_t;
119
120 #endif
117 121
118 122
119 #define ngx_is_init_cycle(cycle) (cycle->conf_ctx == NULL) 123 #define ngx_is_init_cycle(cycle) (cycle->conf_ctx == NULL)
120 124
121 125
134 extern volatile ngx_cycle_t *ngx_cycle; 138 extern volatile ngx_cycle_t *ngx_cycle;
135 extern ngx_array_t ngx_old_cycles; 139 extern ngx_array_t ngx_old_cycles;
136 extern ngx_module_t ngx_core_module; 140 extern ngx_module_t ngx_core_module;
137 extern ngx_uint_t ngx_test_config; 141 extern ngx_uint_t ngx_test_config;
138 extern ngx_uint_t ngx_quiet_mode; 142 extern ngx_uint_t ngx_quiet_mode;
139 #if (NGX_THREADS) 143 #if (NGX_OLD_THREADS)
140 extern ngx_tls_key_t ngx_core_tls_key; 144 extern ngx_tls_key_t ngx_core_tls_key;
141 #endif 145 #endif
142 146
143 147
144 #endif /* _NGX_CYCLE_H_INCLUDED_ */ 148 #endif /* _NGX_CYCLE_H_INCLUDED_ */