Mercurial > hg > nginx

comparison src/core/ngx_cycle.c @ 993:1b9a4d92173f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pass the inherited shm_zone data
author Igor Sysoev <igor@sysoev.ru>
date Tue, 09 Jan 2007 15:59:20 +0000
parents cb876bced0c2
children 151ae1691971
comparison
equal deleted inserted replaced
992:3f2e60adf4ef 993:1b9a4d92173f
400 continue; 400 continue;
401 } 401 }
402 402
403 if (shm_zone[i].shm.size == oshm_zone[n].shm.size) { 403 if (shm_zone[i].shm.size == oshm_zone[n].shm.size) {
404 shm_zone[i].shm.addr = oshm_zone[n].shm.addr; 404 shm_zone[i].shm.addr = oshm_zone[n].shm.addr;
405
406 if (shm_zone[i].init(&shm_zone[i], oshm_zone[n].data)
407 != NGX_OK)
408 {
409 goto failed;
410 }
411
405 goto found; 412 goto found;
406 } 413 }
407 414
408 ngx_shm_free(&oshm_zone[n].shm); 415 ngx_shm_free(&oshm_zone[n].shm);
409 416
444 goto failed; 451 goto failed;
445 } 452 }
446 453
447 ngx_slab_init(shpool); 454 ngx_slab_init(shpool);
448 455
449 if (shm_zone[i].init(&shm_zone[i]) != NGX_OK) { 456 if (shm_zone[i].init(&shm_zone[i], NULL) != NGX_OK) {
450 goto failed; 457 goto failed;
451 } 458 }
452 459
453 found: 460 found:
454 461