commit 98c1cf18c1a4ffb14ded78e93359f87ee7bdeed4
author Igor Sysoev <igor@sysoev.ru> Fri Jul 02 15:54:34 2004 +0000
committer Igor Sysoev <igor@sysoev.ru> Fri Jul 02 15:54:34 2004 +0000
tree 1e2b79792bce785142da3a73a3d68fde1154b542
parent 46cd7c2a9bc740a2d3de03410dd84412b9d85856

nginx-0.0.7-2004-07-02-19:54:34 import

src/event/ngx_event_timer.c

diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c
index c10e230..0b38220 100644
--- a/src/event/ngx_event_timer.c
+++ b/src/event/ngx_event_timer.c
@@ -88,7 +88,17 @@
                            ((char *) node - offsetof(ngx_event_t, rbtree_key));
 
 #if (NGX_THREADS)
-            if (ngx_trylock(ev->lock) == 0) {
+
+            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.
+                 */
+
                 break;
             }
 #endif
@@ -111,17 +121,23 @@
 
             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;
+                ev->returned_instance = ev->instance;
                 ngx_post_event(ev);
 
                 ngx_mutex_unlock(ngx_posted_events_mutex);
+
+                ngx_unlock(ev->lock);
+
                 continue;
             }
+#endif
 
             ev->timedout = 1;