Mercurial > hg > nginx
comparison src/core/nginx.c @ 6016:457ec43dd8d5
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 | 1209b8a7b077 |
children | 8b7f062a3fe6 |
comparison
equal
deleted
inserted
replaced
6015:e11a8e7e8e0c | 6016:457ec43dd8d5 |
---|---|
137 ngx_set_env, | 137 ngx_set_env, |
138 0, | 138 0, |
139 0, | 139 0, |
140 NULL }, | 140 NULL }, |
141 | 141 |
142 #if (NGX_THREADS) | 142 #if (NGX_OLD_THREADS) |
143 | 143 |
144 { ngx_string("worker_threads"), | 144 { ngx_string("worker_threads"), |
145 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, | 145 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, |
146 ngx_conf_set_num_slot, | 146 ngx_conf_set_num_slot, |
147 0, | 147 0, |
957 ccf->rlimit_sigpending = NGX_CONF_UNSET; | 957 ccf->rlimit_sigpending = NGX_CONF_UNSET; |
958 | 958 |
959 ccf->user = (ngx_uid_t) NGX_CONF_UNSET_UINT; | 959 ccf->user = (ngx_uid_t) NGX_CONF_UNSET_UINT; |
960 ccf->group = (ngx_gid_t) NGX_CONF_UNSET_UINT; | 960 ccf->group = (ngx_gid_t) NGX_CONF_UNSET_UINT; |
961 | 961 |
962 #if (NGX_THREADS) | 962 #if (NGX_OLD_THREADS) |
963 ccf->worker_threads = NGX_CONF_UNSET; | 963 ccf->worker_threads = NGX_CONF_UNSET; |
964 ccf->thread_stack_size = NGX_CONF_UNSET_SIZE; | 964 ccf->thread_stack_size = NGX_CONF_UNSET_SIZE; |
965 #endif | 965 #endif |
966 | 966 |
967 if (ngx_array_init(&ccf->env, cycle->pool, 1, sizeof(ngx_str_t)) | 967 if (ngx_array_init(&ccf->env, cycle->pool, 1, sizeof(ngx_str_t)) |
998 "using last mask for remaining worker processes"); | 998 "using last mask for remaining worker processes"); |
999 } | 999 } |
1000 | 1000 |
1001 #endif | 1001 #endif |
1002 | 1002 |
1003 #if (NGX_THREADS) | 1003 #if (NGX_OLD_THREADS) |
1004 | 1004 |
1005 ngx_conf_init_value(ccf->worker_threads, 0); | 1005 ngx_conf_init_value(ccf->worker_threads, 0); |
1006 ngx_threads_n = ccf->worker_threads; | 1006 ngx_threads_n = ccf->worker_threads; |
1007 ngx_conf_init_size_value(ccf->thread_stack_size, 2 * 1024 * 1024); | 1007 ngx_conf_init_size_value(ccf->thread_stack_size, 2 * 1024 * 1024); |
1008 | 1008 |