comparison src/os/unix/ngx_process_cycle.c @ 542:2b9e388c61f1 NGINX_0_8_23

nginx 0.8.23 *) Security: now SSL/TLS renegotiation is disabled. Thanks to Maxim Dounin. *) Bugfix: listen unix domain socket did not inherit while online upgrade. *) Bugfix: the "unix:" parameter of the "set_real_ip_from" directive did not without yet another directive with any IP address. *) Bugfix: segmentation fault and infinite looping in resolver. *) Bugfix: in resolver. Thanks to Artem Bokhan.
author Igor Sysoev <http://sysoev.ru>
date Wed, 11 Nov 2009 00:00:00 +0300
parents 1dcf6adad484
children 40c366b3535c
comparison
equal deleted inserted replaced
541:8da5668048b4 542:2b9e388c61f1
84 { 84 {
85 char *title; 85 char *title;
86 u_char *p; 86 u_char *p;
87 size_t size; 87 size_t size;
88 ngx_int_t i; 88 ngx_int_t i;
89 ngx_uint_t n; 89 ngx_uint_t n, sigio;
90 sigset_t set; 90 sigset_t set;
91 struct itimerval itv; 91 struct itimerval itv;
92 ngx_uint_t live; 92 ngx_uint_t live;
93 ngx_msec_t delay; 93 ngx_msec_t delay;
94 ngx_listening_t *ls; 94 ngx_listening_t *ls;
137 NGX_PROCESS_RESPAWN); 137 NGX_PROCESS_RESPAWN);
138 ngx_start_cache_manager_processes(cycle, 0); 138 ngx_start_cache_manager_processes(cycle, 0);
139 139
140 ngx_new_binary = 0; 140 ngx_new_binary = 0;
141 delay = 0; 141 delay = 0;
142 sigio = 0;
142 live = 1; 143 live = 1;
143 144
144 for ( ;; ) { 145 for ( ;; ) {
145 if (delay) { 146 if (delay) {
146 if (ngx_sigalrm) { 147 if (ngx_sigalrm) {
148 sigio = 0;
147 delay *= 2; 149 delay *= 2;
148 ngx_sigalrm = 0; 150 ngx_sigalrm = 0;
149 } 151 }
150 152
151 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, 153 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
166 168
167 sigsuspend(&set); 169 sigsuspend(&set);
168 170
169 ngx_time_update(0, 0); 171 ngx_time_update(0, 0);
170 172
171 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "wake up"); 173 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
174 "wake up, sigio %i", sigio);
172 175
173 if (ngx_reap) { 176 if (ngx_reap) {
174 ngx_reap = 0; 177 ngx_reap = 0;
175 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "reap children"); 178 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "reap children");
176 179
183 186
184 if (ngx_terminate) { 187 if (ngx_terminate) {
185 if (delay == 0) { 188 if (delay == 0) {
186 delay = 50; 189 delay = 50;
187 } 190 }
191
192 if (sigio) {
193 sigio--;
194 continue;
195 }
196
197 sigio = ccf->worker_processes + 2 /* cache processes */;
188 198
189 if (delay > 1000) { 199 if (delay > 1000) {
190 ngx_signal_worker_processes(cycle, SIGKILL); 200 ngx_signal_worker_processes(cycle, SIGKILL);
191 } else { 201 } else {
192 ngx_signal_worker_processes(cycle, 202 ngx_signal_worker_processes(cycle,