Mercurial > hg > nginx
comparison src/core/nginx.c @ 6111:537259db5af4
Removed "worker_threads" and "thread_stack_size" directives.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Thu, 26 Mar 2015 14:15:17 +0300 |
parents | ac34eff7e147 |
children | 967594ba7571 |
comparison
equal
deleted
inserted
replaced
6110:16c51e80128c | 6111:537259db5af4 |
---|---|
136 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, | 136 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, |
137 ngx_set_env, | 137 ngx_set_env, |
138 0, | 138 0, |
139 0, | 139 0, |
140 NULL }, | 140 NULL }, |
141 | |
142 #if (NGX_OLD_THREADS) | |
143 | |
144 { ngx_string("worker_threads"), | |
145 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, | |
146 ngx_conf_set_num_slot, | |
147 0, | |
148 offsetof(ngx_core_conf_t, worker_threads), | |
149 NULL }, | |
150 | |
151 { ngx_string("thread_stack_size"), | |
152 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, | |
153 ngx_conf_set_size_slot, | |
154 0, | |
155 offsetof(ngx_core_conf_t, thread_stack_size), | |
156 NULL }, | |
157 | |
158 #endif | |
159 | 141 |
160 ngx_null_command | 142 ngx_null_command |
161 }; | 143 }; |
162 | 144 |
163 | 145 |
969 ccf->rlimit_sigpending = NGX_CONF_UNSET; | 951 ccf->rlimit_sigpending = NGX_CONF_UNSET; |
970 | 952 |
971 ccf->user = (ngx_uid_t) NGX_CONF_UNSET_UINT; | 953 ccf->user = (ngx_uid_t) NGX_CONF_UNSET_UINT; |
972 ccf->group = (ngx_gid_t) NGX_CONF_UNSET_UINT; | 954 ccf->group = (ngx_gid_t) NGX_CONF_UNSET_UINT; |
973 | 955 |
974 #if (NGX_OLD_THREADS) | |
975 ccf->worker_threads = NGX_CONF_UNSET; | |
976 ccf->thread_stack_size = NGX_CONF_UNSET_SIZE; | |
977 #endif | |
978 | |
979 if (ngx_array_init(&ccf->env, cycle->pool, 1, sizeof(ngx_str_t)) | 956 if (ngx_array_init(&ccf->env, cycle->pool, 1, sizeof(ngx_str_t)) |
980 != NGX_OK) | 957 != NGX_OK) |
981 { | 958 { |
982 return NULL; | 959 return NULL; |
983 } | 960 } |
1010 "using last mask for remaining worker processes"); | 987 "using last mask for remaining worker processes"); |
1011 } | 988 } |
1012 | 989 |
1013 #endif | 990 #endif |
1014 | 991 |
1015 #if (NGX_OLD_THREADS) | |
1016 | |
1017 ngx_conf_init_value(ccf->worker_threads, 0); | |
1018 ngx_threads_n = ccf->worker_threads; | |
1019 ngx_conf_init_size_value(ccf->thread_stack_size, 2 * 1024 * 1024); | |
1020 | |
1021 #endif | |
1022 | |
1023 | 992 |
1024 if (ccf->pid.len == 0) { | 993 if (ccf->pid.len == 0) { |
1025 ngx_str_set(&ccf->pid, NGX_PID_PATH); | 994 ngx_str_set(&ccf->pid, NGX_PID_PATH); |
1026 } | 995 } |
1027 | 996 |