diff options
author | Maxim Dounin <mdounin@mdounin.ru> | 2011-11-23 17:55:38 +0400 |
---|---|---|
committer | Maxim Dounin <mdounin@mdounin.ru> | 2011-11-23 17:55:38 +0400 |
commit | 91ecc8f43c42c677cd7b2230a68f19b64b649ba5 (patch) | |
tree | f05df203ee000dde0ce2297cea01a6ef663513d4 /src/os | |
parent | 1e5f2391704c252fcd01f798a18aa8558376cb1a (diff) |
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().
Diffstat (limited to 'src/os')
-rw-r--r-- | src/os/unix/ngx_process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c index 08069c4b6..cbdae8be1 100644 --- a/src/os/unix/ngx_process.c +++ b/src/os/unix/ngx_process.c @@ -504,7 +504,7 @@ ngx_process_get_status(void) * held it */ - ngx_atomic_cmp_set(ngx_accept_mutex_ptr, pid, 0); + ngx_shmtx_force_unlock(&ngx_accept_mutex, pid); } |