Mercurial > hg > nginx
comparison src/core/ngx_shmtx.h @ 4807:924d536a8eed stable-1.2
Merge of r4739: s/ngx_shmtx_destory/ngx_shmtx_destroy/.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 06 Aug 2012 18:09:23 +0000 |
parents | d620f497c50f |
children |
comparison
equal
deleted
inserted
replaced
4806:488698c39bfa | 4807:924d536a8eed |
---|---|
37 } ngx_shmtx_t; | 37 } ngx_shmtx_t; |
38 | 38 |
39 | 39 |
40 ngx_int_t ngx_shmtx_create(ngx_shmtx_t *mtx, ngx_shmtx_sh_t *addr, | 40 ngx_int_t ngx_shmtx_create(ngx_shmtx_t *mtx, ngx_shmtx_sh_t *addr, |
41 u_char *name); | 41 u_char *name); |
42 void ngx_shmtx_destory(ngx_shmtx_t *mtx); | 42 void ngx_shmtx_destroy(ngx_shmtx_t *mtx); |
43 ngx_uint_t ngx_shmtx_trylock(ngx_shmtx_t *mtx); | 43 ngx_uint_t ngx_shmtx_trylock(ngx_shmtx_t *mtx); |
44 void ngx_shmtx_lock(ngx_shmtx_t *mtx); | 44 void ngx_shmtx_lock(ngx_shmtx_t *mtx); |
45 void ngx_shmtx_unlock(ngx_shmtx_t *mtx); | 45 void ngx_shmtx_unlock(ngx_shmtx_t *mtx); |
46 ngx_uint_t ngx_shmtx_force_unlock(ngx_shmtx_t *mtx, ngx_pid_t pid); | 46 ngx_uint_t ngx_shmtx_force_unlock(ngx_shmtx_t *mtx, ngx_pid_t pid); |
47 | 47 |