From 0a94cfd2ae9ca87b4d988b5066f739a3034f3bff Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Mon, 28 Jun 2004 21:03:14 +0000 Subject: nginx-0.0.7-2004-06-29-01:03:14 import --- src/event/ngx_event_timer.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/event/ngx_event_timer.c') diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c index 0f6de6793..893b2a9e1 100644 --- a/src/event/ngx_event_timer.c +++ b/src/event/ngx_event_timer.c @@ -87,9 +87,11 @@ void ngx_event_expire_timers(ngx_msec_t timer) ev = (ngx_event_t *) ((char *) node - offsetof(ngx_event_t, rbtree_key)); +#if (NGX_THREADS) if (ngx_trylock(ev->lock) == 0) { break; } +#endif ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0, "event timer del: %d: %d", @@ -109,7 +111,9 @@ void ngx_event_expire_timers(ngx_msec_t timer) ev->timer_set = 0; ev->timedout = 1; +#if (NGX_THREADS) ngx_unlock(ev->lock); +#endif if (ngx_threaded) { if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) { -- cgit