diff options
author | Maxim Dounin <mdounin@mdounin.ru> | 2011-11-23 13:55:38 +0000 |
---|---|---|
committer | Maxim Dounin <mdounin@mdounin.ru> | 2011-11-23 13:55:38 +0000 |
commit | 91ecc8f43c42c677cd7b2230a68f19b64b649ba5 (patch) | |
tree | f05df203ee000dde0ce2297cea01a6ef663513d4 /src/core/ngx_slab.h | |
parent | 1e5f2391704c252fcd01f798a18aa8558376cb1a (diff) | |
download | nginx-91ecc8f43c42c677cd7b2230a68f19b64b649ba5.tar.gz nginx-91ecc8f43c42c677cd7b2230a68f19b64b649ba5.zip |
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/core/ngx_slab.h')
-rw-r--r-- | src/core/ngx_slab.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ngx_slab.h b/src/core/ngx_slab.h index 291e1b51e..202fd9380 100644 --- a/src/core/ngx_slab.h +++ b/src/core/ngx_slab.h @@ -22,7 +22,7 @@ struct ngx_slab_page_s { typedef struct { - ngx_atomic_t lock; + ngx_shmtx_sh_t lock; size_t min_size; size_t min_shift; |