Mercurial > hg > nginx-vendor-0-7
annotate src/core/ngx_shmtx.h @ 366:babd3d9efb62 NGINX_0_6_27
nginx 0.6.27
*) Change: now by default the rtsig method is not built on
Linux 2.6.18+.
*) Change: now a request method is not changed while redirection to a
named location via an "error_page" directive.
*) Feature: the "resolver" and "resolver_timeout" directives in SMTP
proxy.
*) Feature: the "post_action" directive supports named locations.
*) Bugfix: a segmentation fault occurred in worker process, if a
request was redirected from proxy, FastCGI, or memcached location to
static named locations.
*) Bugfix: browsers did not repeat SSL handshake if there is no valid
client certificate in first handshake.
Thanks to Alexander V. Inyukhin.
*) Bugfix: if response code 495-497 was redirected via an "error_page"
directive without code change, then nginx tried to allocate too many
memory.
*) Bugfix: memory leak in long-lived non buffered connections.
*) Bugfix: memory leak in resolver.
*) Bugfix: a segmentation fault occurred in worker process, if a
request was redirected from proxy, FastCGI, or memcached location to
static named locations.
*) Bugfix: in the $proxy_host and $proxy_port variables caching.
Thanks to Sergey Bochenkov.
*) Bugfix: a "proxy_pass" directive with variables used incorrectly the
same port as in another "proxy_pass" directive with the same host
name and without variables.
Thanks to Sergey Bochenkov.
*) Bugfix: an alert "sendmsg() failed (9: Bad file descriptor)" on some
64-bit platforms while reconfiguration.
*) Bugfix: a segmentation fault occurred in worker process, if empty
stub block was used second time in SSI.
*) Bugfix: in copying URI part contained escaped symbols into arguments.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Wed, 12 Mar 2008 00:00:00 +0300 |
parents | 5bef04fc3fd5 |
children | bb941a2996a6 |
rev | line source |
---|---|
160 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4 */ | |
5 | |
6 | |
7 #ifndef _NGX_SHMTX_H_INCLUDED_ | |
8 #define _NGX_SHMTX_H_INCLUDED_ | |
9 | |
10 | |
11 #include <ngx_config.h> | |
12 #include <ngx_core.h> | |
13 | |
14 | |
15 typedef struct { | |
16 #if (NGX_HAVE_ATOMIC_OPS) | |
17 ngx_atomic_t *lock; | |
18 #else | |
19 ngx_fd_t fd; | |
20 u_char *name; | |
21 #endif | |
22 } ngx_shmtx_t; | |
23 | |
24 | |
258 | 25 ngx_int_t ngx_shmtx_create(ngx_shmtx_t *mtx, void *addr, u_char *name); |
160 | 26 |
27 | |
28 #if (NGX_HAVE_ATOMIC_OPS) | |
29 | |
30 static ngx_inline ngx_uint_t | |
31 ngx_shmtx_trylock(ngx_shmtx_t *mtx) | |
32 { | |
274 | 33 return (*mtx->lock == 0 && ngx_atomic_cmp_set(mtx->lock, 0, ngx_pid)); |
160 | 34 } |
35 | |
36 #define ngx_shmtx_lock(mtx) ngx_spinlock((mtx)->lock, ngx_pid, 1024) | |
37 | |
38 #define ngx_shmtx_unlock(mtx) (void) ngx_atomic_cmp_set((mtx)->lock, ngx_pid, 0) | |
39 | |
40 #define ngx_shmtx_destory(mtx) | |
41 | |
42 | |
43 #else | |
44 | |
45 static ngx_inline ngx_uint_t | |
46 ngx_shmtx_trylock(ngx_shmtx_t *mtx) | |
47 { | |
48 ngx_err_t err; | |
49 | |
50 err = ngx_trylock_fd(mtx->fd); | |
51 | |
52 if (err == 0) { | |
53 return 1; | |
54 } | |
55 | |
56 if (err == NGX_EAGAIN) { | |
57 return 0; | |
58 } | |
59 | |
258 | 60 ngx_log_abort(err, ngx_trylock_fd_n " failed"); |
286 | 61 |
62 return 0; | |
160 | 63 } |
64 | |
65 | |
66 static ngx_inline void | |
67 ngx_shmtx_lock(ngx_shmtx_t *mtx) | |
68 { | |
69 ngx_err_t err; | |
70 | |
71 err = ngx_lock_fd(mtx->fd); | |
72 | |
73 if (err == 0) { | |
74 return; | |
75 } | |
76 | |
258 | 77 ngx_log_abort(err, ngx_lock_fd_n " failed"); |
160 | 78 } |
79 | |
80 | |
81 static ngx_inline void | |
82 ngx_shmtx_unlock(ngx_shmtx_t *mtx) | |
83 { | |
84 ngx_err_t err; | |
85 | |
86 err = ngx_unlock_fd(mtx->fd); | |
87 | |
88 if (err == 0) { | |
89 return; | |
90 } | |
91 | |
258 | 92 ngx_log_abort(err, ngx_unlock_fd_n " failed"); |
160 | 93 } |
94 | |
95 | |
96 void ngx_shmtx_destory(ngx_shmtx_t *mtx); | |
97 | |
98 #endif | |
99 | |
100 | |
101 #endif /* _NGX_SHMTX_H_INCLUDED_ */ |