diff src/event/ngx_event_timer.c @ 5820:3377f9459e99

Events: removed broken thread support from posted events. It's mostly dead code. And the idea of thread support for this task has been deprecated.
author Valentin Bartenev <vbart@nginx.com>
date Mon, 01 Sep 2014 18:20:03 +0400
parents 876e6b0814a5
children 1f513d7f1b45
line wrap: on
line diff
--- a/src/event/ngx_event_timer.c
+++ b/src/event/ngx_event_timer.c
@@ -98,24 +98,6 @@ ngx_event_expire_timers(void)
         if ((ngx_msec_int_t) (node->key - ngx_current_msec) <= 0) {
             ev = (ngx_event_t *) ((char *) node - offsetof(ngx_event_t, timer));
 
-#if (NGX_THREADS)
-
-            if (ngx_threaded && ngx_trylock(ev->lock) == 0) {
-
-                /*
-                 * We cannot change the timer of the event that is being
-                 * handled by another thread.  And we cannot easy walk
-                 * the rbtree to find next expired timer so we exit the loop.
-                 * However, it should be a rare case when the event that is
-                 * being handled has an 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: %M",
                            ngx_event_ident(ev->data), ev->timer.key);
@@ -132,18 +114,6 @@ ngx_event_expire_timers(void)
 
             ev->timer_set = 0;
 
-#if (NGX_THREADS)
-            if (ngx_threaded) {
-                ev->posted_timedout = 1;
-
-                ngx_post_event(ev, &ngx_posted_events);
-
-                ngx_unlock(ev->lock);
-
-                continue;
-            }
-#endif
-
             ev->timedout = 1;
 
             ev->handler(ev);