comparison src/event/ngx_event.c @ 860:201d017ea470

slab allocator in shared memory
author Igor Sysoev <igor@sysoev.ru>
date Mon, 20 Nov 2006 08:51:45 +0000
parents f30b1a75fd3b
children 797b54c6425b
comparison
equal deleted inserted replaced
859:d1e8c59a50ee 860:201d017ea470
481 481
482 if (ccf->master == 0) { 482 if (ccf->master == 0) {
483 return NGX_OK; 483 return NGX_OK;
484 } 484 }
485 485
486
487 if (ngx_accept_mutex_ptr) { 486 if (ngx_accept_mutex_ptr) {
488
489 /* reinit ngx_accept_mutex */
490
491 if (ngx_shmtx_create(&ngx_accept_mutex, (void *) ngx_accept_mutex_ptr,
492 ccf->lock_file.data, cycle->log)
493 != NGX_OK)
494 {
495 return NGX_ERROR;
496 }
497
498 return NGX_OK; 487 return NGX_OK;
499 } 488 }
500 489
501 490
502 /* cl should be equal or bigger than cache line size */ 491 /* cl should be equal or bigger than cache line size */
526 515
527 shared = shm.addr; 516 shared = shm.addr;
528 517
529 ngx_accept_mutex_ptr = (ngx_atomic_t *) shared; 518 ngx_accept_mutex_ptr = (ngx_atomic_t *) shared;
530 519
531 if (ngx_shmtx_create(&ngx_accept_mutex, shared, ccf->lock_file.data, 520 if (ngx_shmtx_create(&ngx_accept_mutex, shared, cycle->lock_file.data)
532 cycle->log)
533 != NGX_OK) 521 != NGX_OK)
534 { 522 {
535 return NGX_ERROR; 523 return NGX_ERROR;
536 } 524 }
537 525