comparison src/core/ngx_cycle.c @ 4309:3f6040cd731e

Added shmtx interface to forcibly unlock mutexes. It is currently used from master process on abnormal worker termination to unlock accept mutex (unlocking of accept mutex was broken in 1.0.2). It is expected to be used in the future to unlock other mutexes as well. Shared mutex code was rewritten to make this possible in a safe way, i.e. with a check if lock was actually held by the exited process. We again use pid to lock mutex, and use separate atomic variable for a count of processes waiting in sem_wait().
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 23 Nov 2011 13:55:38 +0000
parents 59b99f217c6d
children d620f497c50f
comparison
equal deleted inserted replaced
4308:39982fa69482 4309:3f6040cd731e
950 950
951 (void) ngx_sprintf(file, "%V%V%Z", &cycle->lock_file, &zn->shm.name); 951 (void) ngx_sprintf(file, "%V%V%Z", &cycle->lock_file, &zn->shm.name);
952 952
953 #endif 953 #endif
954 954
955 if (ngx_shmtx_create(&sp->mutex, (void *) &sp->lock, file) != NGX_OK) { 955 if (ngx_shmtx_create(&sp->mutex, &sp->lock, file) != NGX_OK) {
956 return NGX_ERROR; 956 return NGX_ERROR;
957 } 957 }
958 958
959 ngx_slab_init(sp); 959 ngx_slab_init(sp);
960 960