Mercurial > hg > nginx-vendor-0-6
view src/event/ngx_event_timer.c @ 92:45945fa8b8ba NGINX_0_2_0
nginx 0.2.0
*) The pid-file names used during online upgrade was changed and now is
not required a manual rename operation. The old master process adds
the ".oldbin" suffix to its pid-file and executes a new binary file.
The new master process creates usual pid-file without the ".newbin"
suffix. If the master process exits, then old master process renames
back its pid-file with the ".oldbin" suffix to the pid-file without
suffix.
*) Change: the "worker_connections" directive, new name of the
"connections" directive; now the directive specifies maximum number
of connections, but not maximum socket descriptor number.
*) Feature: SSL supports the session cache inside one worker process.
*) Feature: the "satisfy_any" directive.
*) Change: the ngx_http_access_module and ngx_http_auth_basic_module do
not run for subrequests.
*) Feature: the "worker_rlimit_nofile" and "worker_rlimit_sigpending"
directives.
*) Bugfix: if all backend using in load-balancing failed after one
error, then nginx did not try do connect to them during 60 seconds.
*) Bugfix: in IMAP/POP3 command argument parsing.
Thanks to Rob Mueller.
*) Bugfix: errors while using SSL in IMAP/POP3 proxy.
*) Bugfix: errors while using SSI and gzipping.
*) Bugfix: the "Expires" and "Cache-Control" header lines were omitted
from the 304 responses.
Thanks to Alexandr Kukushkin.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Fri, 23 Sep 2005 00:00:00 +0400 |
parents | 991c6e4c7654 |
children | 45f7329b4bd0 |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev */ #include <ngx_config.h> #include <ngx_core.h> #include <ngx_event.h> #if (NGX_THREADS) ngx_mutex_t *ngx_event_timer_mutex; #endif ngx_thread_volatile ngx_rbtree_t *ngx_event_timer_rbtree; ngx_rbtree_t ngx_event_timer_sentinel; ngx_int_t ngx_event_timer_init(ngx_log_t *log) { if (ngx_event_timer_rbtree) { #if (NGX_THREADS) ngx_event_timer_mutex->log = log; #endif return NGX_OK; } ngx_event_timer_rbtree = &ngx_event_timer_sentinel; #if (NGX_THREADS) ngx_event_timer_mutex = ngx_mutex_init(log, 0); if (ngx_event_timer_mutex == NULL) { return NGX_ERROR; } #endif return NGX_OK; } ngx_msec_t ngx_event_find_timer(void) { ngx_msec_t timer; ngx_rbtree_t *node; if (ngx_event_timer_rbtree == &ngx_event_timer_sentinel) { return NGX_TIMER_INFINITE; } if (ngx_mutex_lock(ngx_event_timer_mutex) == NGX_ERROR) { return NGX_TIMER_ERROR; } node = ngx_rbtree_min((ngx_rbtree_t *) ngx_event_timer_rbtree, &ngx_event_timer_sentinel); ngx_mutex_unlock(ngx_event_timer_mutex); timer = (ngx_msec_t) (node->key * NGX_TIMER_RESOLUTION - ngx_elapsed_msec / NGX_TIMER_RESOLUTION * NGX_TIMER_RESOLUTION); #if 0 (node->key * NGX_TIMER_RESOLUTION - ngx_elapsed_msec); #endif return timer > 0 ? timer : 0 ; } void ngx_event_expire_timers(ngx_msec_t timer) { ngx_event_t *ev; ngx_rbtree_t *node; if (timer < 0) { /* avoid the endless loop if the time goes backward for some reason */ timer = 0; } for ( ;; ) { if (ngx_event_timer_rbtree == &ngx_event_timer_sentinel) { return; } if (ngx_mutex_lock(ngx_event_timer_mutex) == NGX_ERROR) { return; } node = ngx_rbtree_min((ngx_rbtree_t *) ngx_event_timer_rbtree, &ngx_event_timer_sentinel); if (node->key <= (ngx_msec_t) (ngx_old_elapsed_msec + timer) / NGX_TIMER_RESOLUTION) { ev = (ngx_event_t *) ((char *) node - offsetof(ngx_event_t, rbtree_key)); #if (NGX_THREADS) 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. */ ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0, "event %p is busy in expire timers", ev); break; } #endif ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0, "event timer del: %d: %i", ngx_event_ident(ev->data), ev->rbtree_key); 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); #if (NGX_DEBUG) ev->rbtree_left = NULL; ev->rbtree_right = NULL; ev->rbtree_parent = NULL; #endif ev->timer_set = 0; #if (NGX_THREADS) if (ngx_threaded) { if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) { return; } ev->posted_timedout = 1; ngx_post_event(ev); ngx_mutex_unlock(ngx_posted_events_mutex); ngx_unlock(ev->lock); continue; } #endif ev->timedout = 1; ev->handler(ev); continue; } break; } ngx_mutex_unlock(ngx_event_timer_mutex); }