Mercurial > hg > nginx-vendor-0-7
annotate src/event/ngx_event_timer.c @ 58:b55cbf18157e NGINX_0_1_29
nginx 0.1.29
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; bug appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Thu, 12 May 2005 00:00:00 +0400 |
parents | 72eb30262aac |
children | 5db440287648 |
rev | line source |
---|---|
0 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4 */ | |
5 | |
6 | |
7 #include <ngx_config.h> | |
8 #include <ngx_core.h> | |
9 #include <ngx_event.h> | |
10 | |
11 | |
12 #if (NGX_THREADS) | |
13 ngx_mutex_t *ngx_event_timer_mutex; | |
14 #endif | |
15 | |
16 | |
17 ngx_thread_volatile ngx_rbtree_t *ngx_event_timer_rbtree; | |
18 ngx_rbtree_t ngx_event_timer_sentinel; | |
19 | |
20 | |
42 | 21 ngx_int_t |
22 ngx_event_timer_init(ngx_log_t *log) | |
0 | 23 { |
24 if (ngx_event_timer_rbtree) { | |
25 #if (NGX_THREADS) | |
26 ngx_event_timer_mutex->log = log; | |
27 #endif | |
28 return NGX_OK; | |
29 } | |
30 | |
31 ngx_event_timer_rbtree = &ngx_event_timer_sentinel; | |
32 | |
33 #if (NGX_THREADS) | |
50 | 34 ngx_event_timer_mutex = ngx_mutex_init(log, 0); |
35 if (ngx_event_timer_mutex == NULL) { | |
0 | 36 return NGX_ERROR; |
37 } | |
38 #endif | |
39 | |
40 return NGX_OK; | |
41 } | |
42 | |
43 | |
42 | 44 ngx_msec_t |
45 ngx_event_find_timer(void) | |
0 | 46 { |
47 ngx_msec_t timer; | |
48 ngx_rbtree_t *node; | |
49 | |
50 if (ngx_event_timer_rbtree == &ngx_event_timer_sentinel) { | |
51 return NGX_TIMER_INFINITE; | |
52 } | |
53 | |
54 if (ngx_mutex_lock(ngx_event_timer_mutex) == NGX_ERROR) { | |
55 return NGX_TIMER_ERROR; | |
56 } | |
57 | |
58 node = ngx_rbtree_min((ngx_rbtree_t *) ngx_event_timer_rbtree, | |
59 &ngx_event_timer_sentinel); | |
60 | |
61 ngx_mutex_unlock(ngx_event_timer_mutex); | |
62 | |
63 timer = (ngx_msec_t) | |
64 (node->key * NGX_TIMER_RESOLUTION - | |
65 ngx_elapsed_msec / NGX_TIMER_RESOLUTION * NGX_TIMER_RESOLUTION); | |
66 #if 0 | |
67 (node->key * NGX_TIMER_RESOLUTION - ngx_elapsed_msec); | |
68 #endif | |
69 | |
70 return timer > 0 ? timer: 0 ; | |
71 } | |
72 | |
73 | |
42 | 74 void |
75 ngx_event_expire_timers(ngx_msec_t timer) | |
0 | 76 { |
77 ngx_event_t *ev; | |
78 ngx_rbtree_t *node; | |
79 | |
80 if (timer < 0) { | |
81 /* avoid the endless loop if the time goes backward for some reason */ | |
82 timer = 0; | |
83 } | |
84 | |
85 for ( ;; ) { | |
86 | |
87 if (ngx_event_timer_rbtree == &ngx_event_timer_sentinel) { | |
88 return; | |
89 } | |
90 | |
91 if (ngx_mutex_lock(ngx_event_timer_mutex) == NGX_ERROR) { | |
92 return; | |
93 } | |
94 | |
95 node = ngx_rbtree_min((ngx_rbtree_t *) ngx_event_timer_rbtree, | |
96 &ngx_event_timer_sentinel); | |
97 | |
98 if (node->key <= (ngx_msec_t) | |
99 (ngx_old_elapsed_msec + timer) / NGX_TIMER_RESOLUTION) | |
100 { | |
101 ev = (ngx_event_t *) | |
102 ((char *) node - offsetof(ngx_event_t, rbtree_key)); | |
103 | |
104 #if (NGX_THREADS) | |
105 | |
106 if (ngx_threaded && ngx_trylock(ev->lock) == 0) { | |
107 | |
108 /* | |
109 * We can not change the timer of the event that is been | |
110 * handling by another thread. And we can not easy walk | |
111 * the rbtree to find a next expired timer so we exit the loop. | |
112 * However it should be rare case when the event that is | |
113 * been handling has expired timer. | |
114 */ | |
115 | |
116 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0, | |
10 | 117 "event %p is busy in expire timers", ev); |
0 | 118 break; |
119 } | |
120 #endif | |
121 | |
122 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0, | |
10 | 123 "event timer del: %d: %i", |
0 | 124 ngx_event_ident(ev->data), ev->rbtree_key); |
125 | |
126 ngx_rbtree_delete((ngx_rbtree_t **) &ngx_event_timer_rbtree, | |
127 &ngx_event_timer_sentinel, | |
128 (ngx_rbtree_t *) &ev->rbtree_key); | |
129 | |
130 ngx_mutex_unlock(ngx_event_timer_mutex); | |
131 | |
132 #if (NGX_DEBUG) | |
133 ev->rbtree_left = NULL; | |
134 ev->rbtree_right = NULL; | |
135 ev->rbtree_parent = NULL; | |
136 #endif | |
137 | |
138 ev->timer_set = 0; | |
139 | |
140 #if (NGX_THREADS) | |
141 if (ngx_threaded) { | |
142 if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) { | |
143 return; | |
144 } | |
145 | |
146 ev->posted_timedout = 1; | |
147 ngx_post_event(ev); | |
148 | |
149 ngx_mutex_unlock(ngx_posted_events_mutex); | |
150 | |
151 ngx_unlock(ev->lock); | |
152 | |
153 continue; | |
154 } | |
155 #endif | |
156 | |
157 ev->timedout = 1; | |
158 | |
58 | 159 ev->handler(ev); |
0 | 160 |
161 continue; | |
162 } | |
163 | |
164 break; | |
165 } | |
166 | |
167 ngx_mutex_unlock(ngx_event_timer_mutex); | |
168 } |