Mercurial > hg > nginx-vendor-current

comparison src/os/unix/ngx_process_cycle.c @ 688:f31b19fe7f48 NGINX_1_3_7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.3.7 *) Feature: OCSP stapling support. Thanks to Comodo, DigiCert and GlobalSign for sponsoring this work. *) Feature: the "ssl_trusted_certificate" directive. *) Feature: resolver now randomly rotates addresses returned from cache. Thanks to Anton Jouline. *) Bugfix: OpenSSL 0.9.7 compatibility.
author Igor Sysoev <http://sysoev.ru>
date Tue, 02 Oct 2012 00:00:00 +0400
parents 981b4c44593b
children 6db6e93f55ee
comparison
equal deleted inserted replaced
687:a7305f494f1c 688:f31b19fe7f48
369 ch.slot = ngx_process_slot; 369 ch.slot = ngx_process_slot;
370 ch.fd = ngx_processes[ngx_process_slot].channel[0]; 370 ch.fd = ngx_processes[ngx_process_slot].channel[0];
371 371
372 ngx_pass_open_channel(cycle, &ch); 372 ngx_pass_open_channel(cycle, &ch);
373 } 373 }
374
375 cpu_affinity = 0;
374 } 376 }
375 377
376 378
377 static void 379 static void
378 ngx_start_cache_manager_processes(ngx_cycle_t *cycle, ngx_uint_t respawn) 380 ngx_start_cache_manager_processes(ngx_cycle_t *cycle, ngx_uint_t respawn)
382 ngx_channel_t ch; 384 ngx_channel_t ch;
383 385
384 manager = 0; 386 manager = 0;
385 loader = 0; 387 loader = 0;
386 388
387 path = ngx_cycle->pathes.elts; 389 path = ngx_cycle->paths.elts;
388 for (i = 0; i < ngx_cycle->pathes.nelts; i++) { 390 for (i = 0; i < ngx_cycle->paths.nelts; i++) {
389 391
390 if (path[i]->manager) { 392 if (path[i]->manager) {
391 manager = 1; 393 manager = 1;
392 } 394 }
393 395
1337 ngx_uint_t i; 1339 ngx_uint_t i;
1338 ngx_path_t **path; 1340 ngx_path_t **path;
1339 1341
1340 next = 60 * 60; 1342 next = 60 * 60;
1341 1343
1342 path = ngx_cycle->pathes.elts; 1344 path = ngx_cycle->paths.elts;
1343 for (i = 0; i < ngx_cycle->pathes.nelts; i++) { 1345 for (i = 0; i < ngx_cycle->paths.nelts; i++) {
1344 1346
1345 if (path[i]->manager) { 1347 if (path[i]->manager) {
1346 n = path[i]->manager(path[i]->data); 1348 n = path[i]->manager(path[i]->data);
1347 1349
1348 next = (n <= next) ? n : next; 1350 next = (n <= next) ? n : next;
1366 ngx_path_t **path; 1368 ngx_path_t **path;
1367 ngx_cycle_t *cycle; 1369 ngx_cycle_t *cycle;
1368 1370
1369 cycle = (ngx_cycle_t *) ngx_cycle; 1371 cycle = (ngx_cycle_t *) ngx_cycle;
1370 1372
1371 path = cycle->pathes.elts; 1373 path = cycle->paths.elts;
1372 for (i = 0; i < cycle->pathes.nelts; i++) { 1374 for (i = 0; i < cycle->paths.nelts; i++) {
1373 1375
1374 if (ngx_terminate || ngx_quit) { 1376 if (ngx_terminate || ngx_quit) {
1375 break; 1377 break;
1376 } 1378 }
1377 1379