2003-01-22 01:36:01 +08:00
|
|
|
|
2004-09-28 16:34:51 +08:00
|
|
|
/*
|
2004-09-30 00:00:49 +08:00
|
|
|
* Copyright (C) Igor Sysoev
|
2004-09-28 16:34:51 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
2003-01-24 02:47:54 +08:00
|
|
|
#include <ngx_config.h>
|
|
|
|
#include <ngx_core.h>
|
|
|
|
#include <ngx_event.h>
|
|
|
|
|
|
|
|
|
2004-02-24 04:57:12 +08:00
|
|
|
#if (NGX_THREADS)
|
2004-02-26 04:16:15 +08:00
|
|
|
ngx_mutex_t *ngx_event_timer_mutex;
|
2004-02-24 04:57:12 +08:00
|
|
|
#endif
|
|
|
|
|
2003-12-15 04:10:27 +08:00
|
|
|
|
2004-03-02 23:40:59 +08:00
|
|
|
ngx_thread_volatile ngx_rbtree_t *ngx_event_timer_rbtree;
|
|
|
|
ngx_rbtree_t ngx_event_timer_sentinel;
|
2003-12-04 22:53:00 +08:00
|
|
|
|
|
|
|
|
2005-02-22 22:40:13 +08:00
|
|
|
ngx_int_t
|
|
|
|
ngx_event_timer_init(ngx_log_t *log)
|
2003-12-04 22:53:00 +08:00
|
|
|
{
|
2004-01-06 04:55:48 +08:00
|
|
|
if (ngx_event_timer_rbtree) {
|
2004-03-01 05:03:02 +08:00
|
|
|
#if (NGX_THREADS)
|
2004-02-26 04:16:15 +08:00
|
|
|
ngx_event_timer_mutex->log = log;
|
2004-03-01 05:03:02 +08:00
|
|
|
#endif
|
2004-02-26 04:16:15 +08:00
|
|
|
return NGX_OK;
|
2003-12-09 23:08:11 +08:00
|
|
|
}
|
|
|
|
|
2003-12-06 01:07:27 +08:00
|
|
|
ngx_event_timer_rbtree = &ngx_event_timer_sentinel;
|
2004-02-26 04:16:15 +08:00
|
|
|
|
2004-03-01 05:03:02 +08:00
|
|
|
#if (NGX_THREADS)
|
2005-03-19 20:38:37 +08:00
|
|
|
ngx_event_timer_mutex = ngx_mutex_init(log, 0);
|
|
|
|
if (ngx_event_timer_mutex == NULL) {
|
2004-02-26 04:16:15 +08:00
|
|
|
return NGX_ERROR;
|
|
|
|
}
|
2004-03-01 05:03:02 +08:00
|
|
|
#endif
|
2004-02-26 04:16:15 +08:00
|
|
|
|
|
|
|
return NGX_OK;
|
2003-12-04 22:53:00 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-02-22 22:40:13 +08:00
|
|
|
ngx_msec_t
|
|
|
|
ngx_event_find_timer(void)
|
2003-12-04 22:53:00 +08:00
|
|
|
{
|
2004-04-15 01:44:28 +08:00
|
|
|
ngx_msec_t timer;
|
2003-12-04 22:53:00 +08:00
|
|
|
ngx_rbtree_t *node;
|
|
|
|
|
2003-12-19 20:45:27 +08:00
|
|
|
if (ngx_event_timer_rbtree == &ngx_event_timer_sentinel) {
|
2004-04-15 04:34:05 +08:00
|
|
|
return NGX_TIMER_INFINITE;
|
2003-12-19 20:45:27 +08:00
|
|
|
}
|
|
|
|
|
2004-02-26 04:16:15 +08:00
|
|
|
if (ngx_mutex_lock(ngx_event_timer_mutex) == NGX_ERROR) {
|
|
|
|
return NGX_TIMER_ERROR;
|
|
|
|
}
|
|
|
|
|
2004-03-01 05:03:02 +08:00
|
|
|
node = ngx_rbtree_min((ngx_rbtree_t *) ngx_event_timer_rbtree,
|
|
|
|
&ngx_event_timer_sentinel);
|
2003-12-04 22:53:00 +08:00
|
|
|
|
2004-02-26 04:16:15 +08:00
|
|
|
ngx_mutex_unlock(ngx_event_timer_mutex);
|
|
|
|
|
2004-04-15 01:44:28 +08:00
|
|
|
timer = (ngx_msec_t)
|
2003-12-15 04:10:27 +08:00
|
|
|
(node->key * NGX_TIMER_RESOLUTION -
|
|
|
|
ngx_elapsed_msec / NGX_TIMER_RESOLUTION * NGX_TIMER_RESOLUTION);
|
|
|
|
#if 0
|
2003-12-05 15:11:46 +08:00
|
|
|
(node->key * NGX_TIMER_RESOLUTION - ngx_elapsed_msec);
|
2003-12-15 04:10:27 +08:00
|
|
|
#endif
|
2004-04-15 01:44:28 +08:00
|
|
|
|
2004-04-15 04:34:05 +08:00
|
|
|
return timer > 0 ? timer: 0 ;
|
2003-12-04 22:53:00 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-02-22 22:40:13 +08:00
|
|
|
void
|
|
|
|
ngx_event_expire_timers(ngx_msec_t timer)
|
2003-12-04 22:53:00 +08:00
|
|
|
{
|
|
|
|
ngx_event_t *ev;
|
|
|
|
ngx_rbtree_t *node;
|
|
|
|
|
2004-07-07 00:12:16 +08:00
|
|
|
if (timer < 0) {
|
|
|
|
/* avoid the endless loop if the time goes backward for some reason */
|
|
|
|
timer = 0;
|
|
|
|
}
|
|
|
|
|
2003-12-04 22:53:00 +08:00
|
|
|
for ( ;; ) {
|
|
|
|
|
2003-12-19 20:45:27 +08:00
|
|
|
if (ngx_event_timer_rbtree == &ngx_event_timer_sentinel) {
|
2004-06-29 00:05:02 +08:00
|
|
|
return;
|
2003-12-04 22:53:00 +08:00
|
|
|
}
|
|
|
|
|
2004-02-26 04:16:15 +08:00
|
|
|
if (ngx_mutex_lock(ngx_event_timer_mutex) == NGX_ERROR) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2004-03-01 05:03:02 +08:00
|
|
|
node = ngx_rbtree_min((ngx_rbtree_t *) ngx_event_timer_rbtree,
|
2003-12-19 20:45:27 +08:00
|
|
|
&ngx_event_timer_sentinel);
|
|
|
|
|
2004-04-15 04:34:05 +08:00
|
|
|
if (node->key <= (ngx_msec_t)
|
2003-12-06 01:07:27 +08:00
|
|
|
(ngx_old_elapsed_msec + timer) / NGX_TIMER_RESOLUTION)
|
2003-12-04 22:53:00 +08:00
|
|
|
{
|
|
|
|
ev = (ngx_event_t *)
|
2003-12-05 15:11:46 +08:00
|
|
|
((char *) node - offsetof(ngx_event_t, rbtree_key));
|
2003-12-04 22:53:00 +08:00
|
|
|
|
2004-06-29 05:03:14 +08:00
|
|
|
#if (NGX_THREADS)
|
2004-07-02 23:54:34 +08:00
|
|
|
|
|
|
|
if (ngx_threaded && ngx_trylock(ev->lock) == 0) {
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We can not change the timer of the event that is been
|
|
|
|
* handling by another thread. And we can not easy walk
|
|
|
|
* the rbtree to find a next expired timer so we exit the loop.
|
|
|
|
* However it should be rare case when the event that is
|
|
|
|
* been handling has expired timer.
|
|
|
|
*/
|
|
|
|
|
2004-07-07 00:12:16 +08:00
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0,
|
2004-11-11 22:07:14 +08:00
|
|
|
"event %p is busy in expire timers", ev);
|
2004-06-29 00:05:02 +08:00
|
|
|
break;
|
|
|
|
}
|
2004-06-29 05:03:14 +08:00
|
|
|
#endif
|
2004-06-29 00:05:02 +08:00
|
|
|
|
|
|
|
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
|
2004-11-11 22:07:14 +08:00
|
|
|
"event timer del: %d: %i",
|
2005-05-19 21:25:22 +08:00
|
|
|
ngx_event_ident(ev->data), ev->rbtree_key);
|
2004-06-29 00:05:02 +08:00
|
|
|
|
|
|
|
ngx_rbtree_delete((ngx_rbtree_t **) &ngx_event_timer_rbtree,
|
|
|
|
&ngx_event_timer_sentinel,
|
|
|
|
(ngx_rbtree_t *) &ev->rbtree_key);
|
|
|
|
|
|
|
|
ngx_mutex_unlock(ngx_event_timer_mutex);
|
2003-12-04 22:53:00 +08:00
|
|
|
|
2004-06-29 00:05:02 +08:00
|
|
|
#if (NGX_DEBUG)
|
|
|
|
ev->rbtree_left = NULL;
|
|
|
|
ev->rbtree_right = NULL;
|
|
|
|
ev->rbtree_parent = NULL;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
ev->timer_set = 0;
|
2003-12-04 22:53:00 +08:00
|
|
|
|
2004-07-02 23:54:34 +08:00
|
|
|
#if (NGX_THREADS)
|
2004-04-05 04:32:09 +08:00
|
|
|
if (ngx_threaded) {
|
|
|
|
if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2004-07-02 13:47:00 +08:00
|
|
|
ev->posted_timedout = 1;
|
2004-04-05 04:32:09 +08:00
|
|
|
ngx_post_event(ev);
|
|
|
|
|
|
|
|
ngx_mutex_unlock(ngx_posted_events_mutex);
|
2004-07-02 23:54:34 +08:00
|
|
|
|
|
|
|
ngx_unlock(ev->lock);
|
|
|
|
|
2004-04-05 04:32:09 +08:00
|
|
|
continue;
|
|
|
|
}
|
2004-07-02 23:54:34 +08:00
|
|
|
#endif
|
2004-02-26 04:16:15 +08:00
|
|
|
|
2004-07-02 13:47:00 +08:00
|
|
|
ev->timedout = 1;
|
|
|
|
|
nginx-0.1.29-RELEASE import
*) 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; the bug had 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.
2005-05-12 22:58:06 +08:00
|
|
|
ev->handler(ev);
|
2004-07-02 13:47:00 +08:00
|
|
|
|
2003-12-04 22:53:00 +08:00
|
|
|
continue;
|
|
|
|
}
|
2004-07-02 13:47:00 +08:00
|
|
|
|
2003-12-04 22:53:00 +08:00
|
|
|
break;
|
|
|
|
}
|
2004-06-29 00:05:02 +08:00
|
|
|
|
|
|
|
ngx_mutex_unlock(ngx_event_timer_mutex);
|
2003-12-04 22:53:00 +08:00
|
|
|
}
|