Mercurial > hg > nginx
comparison src/os/unix/ngx_process_cycle.c @ 4902:db9ce6fc9482 stable-1.2
Merge of r4870, r4871, r4890, r4895: minor fixes.
*) Made sure to initialize the entire ngx_file_t structure.
Found by Coverity.
*) Correct plural form for "path" in the whole source base.
*) Removed conditional compilation from waitpid() error test.
There are reports that call to a signal handler for an exited process
despite waitpid() already called for the process may happen on Linux
as well.
*) Style, parentheses instead of braces in misc/GNUMakefile.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 12 Nov 2012 18:39:51 +0000 |
parents | 615d184cde74 |
children | e8ef31c58d43 |
comparison
equal
deleted
inserted
replaced
4901:a0cb7fc23cc2 | 4902:db9ce6fc9482 |
---|---|
384 ngx_channel_t ch; | 384 ngx_channel_t ch; |
385 | 385 |
386 manager = 0; | 386 manager = 0; |
387 loader = 0; | 387 loader = 0; |
388 | 388 |
389 path = ngx_cycle->pathes.elts; | 389 path = ngx_cycle->paths.elts; |
390 for (i = 0; i < ngx_cycle->pathes.nelts; i++) { | 390 for (i = 0; i < ngx_cycle->paths.nelts; i++) { |
391 | 391 |
392 if (path[i]->manager) { | 392 if (path[i]->manager) { |
393 manager = 1; | 393 manager = 1; |
394 } | 394 } |
395 | 395 |
1339 ngx_uint_t i; | 1339 ngx_uint_t i; |
1340 ngx_path_t **path; | 1340 ngx_path_t **path; |
1341 | 1341 |
1342 next = 60 * 60; | 1342 next = 60 * 60; |
1343 | 1343 |
1344 path = ngx_cycle->pathes.elts; | 1344 path = ngx_cycle->paths.elts; |
1345 for (i = 0; i < ngx_cycle->pathes.nelts; i++) { | 1345 for (i = 0; i < ngx_cycle->paths.nelts; i++) { |
1346 | 1346 |
1347 if (path[i]->manager) { | 1347 if (path[i]->manager) { |
1348 n = path[i]->manager(path[i]->data); | 1348 n = path[i]->manager(path[i]->data); |
1349 | 1349 |
1350 next = (n <= next) ? n : next; | 1350 next = (n <= next) ? n : next; |
1368 ngx_path_t **path; | 1368 ngx_path_t **path; |
1369 ngx_cycle_t *cycle; | 1369 ngx_cycle_t *cycle; |
1370 | 1370 |
1371 cycle = (ngx_cycle_t *) ngx_cycle; | 1371 cycle = (ngx_cycle_t *) ngx_cycle; |
1372 | 1372 |
1373 path = cycle->pathes.elts; | 1373 path = cycle->paths.elts; |
1374 for (i = 0; i < cycle->pathes.nelts; i++) { | 1374 for (i = 0; i < cycle->paths.nelts; i++) { |
1375 | 1375 |
1376 if (ngx_terminate || ngx_quit) { | 1376 if (ngx_terminate || ngx_quit) { |
1377 break; | 1377 break; |
1378 } | 1378 } |
1379 | 1379 |