Mercurial > hg > nginx-vendor-0-8
diff src/event/ngx_event_timer.c @ 112:408f195b3482 NGINX_0_3_3
nginx 0.3.3
*) Change: the "bl" and "af" parameters of the "listen" directive was
renamed to the "backlog" and "accept_filter".
*) Feature: the "rcvbuf" and "sndbuf" parameters of the "listen"
directive.
*) Change: the "$msec" log parameter does not require now the
additional the gettimeofday() system call.
*) Feature: the -t switch now tests the "listen" directives.
*) Bugfix: if the invalid address was specified in the "listen"
directive, then after the -HUP signal nginx left an open socket in
the CLOSED state.
*) Bugfix: the mime type may be incorrectly set to default value for
index file with variable in the name; bug appeared in 0.3.0.
*) Feature: the "timer_resolution" directive.
*) Feature: the millisecond "$upstream_response_time" log parameter.
*) Bugfix: a temporary file with client request body now is removed
just after the response header was transferred to a client.
*) Bugfix: OpenSSL 0.9.6 compatibility.
*) Bugfix: the SSL certificate and key file paths could not be relative.
*) Bugfix: the "ssl_prefer_server_ciphers" directive did not work in
the ngx_imap_ssl_module.
*) Bugfix: the "ssl_protocols" directive allowed to specify the single
protocol only.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Wed, 19 Oct 2005 00:00:00 +0400 |
parents | dad2fe8ecf08 |
children | 6ae1357b7b7c |
line wrap: on
line diff
--- a/src/event/ngx_event_timer.c +++ b/src/event/ngx_event_timer.c @@ -52,9 +52,7 @@ ngx_event_find_timer(void) return NGX_TIMER_INFINITE; } - if (ngx_mutex_lock(ngx_event_timer_mutex) == NGX_ERROR) { - return NGX_TIMER_ERROR; - } + ngx_mutex_lock(ngx_event_timer_mutex); root = ngx_event_timer_rbtree.root; sentinel = ngx_event_timer_rbtree.sentinel; @@ -63,7 +61,7 @@ ngx_event_find_timer(void) ngx_mutex_unlock(ngx_event_timer_mutex); - timer = (ngx_msec_int_t) node->key - (ngx_msec_int_t) ngx_current_time; + timer = (ngx_msec_int_t) node->key - (ngx_msec_int_t) ngx_current_msec; return (ngx_msec_t) (timer > 0 ? timer : 0); } @@ -79,9 +77,7 @@ ngx_event_expire_timers(void) for ( ;; ) { - if (ngx_mutex_lock(ngx_event_timer_mutex) == NGX_ERROR) { - return; - } + ngx_mutex_lock(ngx_event_timer_mutex); root = ngx_event_timer_rbtree.root; @@ -93,7 +89,7 @@ ngx_event_expire_timers(void) /* node->key <= ngx_current_time */ - if ((ngx_msec_int_t) node->key - (ngx_msec_int_t) ngx_current_time <= 0) + if ((ngx_msec_int_t) node->key - (ngx_msec_int_t) ngx_current_msec <= 0) { ev = (ngx_event_t *) ((char *) node - offsetof(ngx_event_t, timer)); @@ -133,14 +129,9 @@ ngx_event_expire_timers(void) #if (NGX_THREADS) if (ngx_threaded) { - if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) { - return; - } + ev->posted_timedout = 1; - ev->posted_timedout = 1; - ngx_post_event(ev); - - ngx_mutex_unlock(ngx_posted_events_mutex); + ngx_post_event(ev, &ngx_posted_events); ngx_unlock(ev->lock);