Events: introduced cancelable timers.

diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index 6531ec7add34b110fea2ddba9396d48c2bcc5d24..a1643a1343de8e2d4ad2b21df592e36d89f2f53e 100644 (file)
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -136,6 +136,8 @@ struct ngx_event_s {
     unsigned         channel:1;
     unsigned         resolver:1;
 
+    unsigned         cancelable:1;
+
 
 #if 0
 

diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c
index b7f2ade382c237ebe172f43ea93229a6acc192dc..8f547b215ac93389a7480aef4d85dac6586674e6 100644 (file)
--- a/src/event/ngx_event_timer.c
+++ b/src/event/ngx_event_timer.c
@@ -94,3 +94,45 @@ ngx_event_expire_timers(void)
         ev->handler(ev);
     }
 }
+
+
+void
+ngx_event_cancel_timers(void)
+{
+    ngx_event_t        *ev;
+    ngx_rbtree_node_t  *node, *root, *sentinel;
+
+    sentinel = ngx_event_timer_rbtree.sentinel;
+
+    for ( ;; ) {
+        root = ngx_event_timer_rbtree.root;
+
+        if (root == sentinel) {
+            return;
+        }
+
+        node = ngx_rbtree_min(root, sentinel);
+
+        ev = (ngx_event_t *) ((char *) node - offsetof(ngx_event_t, timer));
+
+        if (!ev->cancelable) {
+            return;
+        }
+
+        ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
+                       "event timer cancel: %d: %M",
+                       ngx_event_ident(ev->data), ev->timer.key);
+
+        ngx_rbtree_delete(&ngx_event_timer_rbtree, &ev->timer);
+
+#if (NGX_DEBUG)
+        ev->timer.left = NULL;
+        ev->timer.right = NULL;
+        ev->timer.parent = NULL;
+#endif
+
+        ev->timer_set = 0;
+
+        ev->handler(ev);
+    }
+}

diff --git a/src/event/ngx_event_timer.h b/src/event/ngx_event_timer.h
index df55d3cd6f73cd352f5974e0bb39efa283cd6266..99f8a48fbda7902980fd48cd1a5e318251f4ea6c 100644 (file)
--- a/src/event/ngx_event_timer.h
+++ b/src/event/ngx_event_timer.h
@@ -22,6 +22,7 @@
 ngx_int_t ngx_event_timer_init(ngx_log_t *log);
 ngx_msec_t ngx_event_find_timer(void);
 void ngx_event_expire_timers(void);
+void ngx_event_cancel_timers(void);
 
 
 extern ngx_rbtree_t  ngx_event_timer_rbtree;

diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index 196394488e015320d67c72f5f20406b84c5123f9..51cf725446e5e66612b6ffbc4ab5628a6fb60dad 100644 (file)
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -809,6 +809,8 @@ ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data)
                 }
             }
 
+            ngx_event_cancel_timers();
+
             if (ngx_event_timer_rbtree.root == ngx_event_timer_rbtree.sentinel)
             {
                 ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting");

diff --git a/src/os/win32/ngx_process_cycle.c b/src/os/win32/ngx_process_cycle.c
index 183efc8963843cbd9df6e4bd0725396c00da38de..7bfb281192e6ab66e7d4d192a0989927aab59ffb 100644 (file)
--- a/src/os/win32/ngx_process_cycle.c
+++ b/src/os/win32/ngx_process_cycle.c
@@ -821,6 +821,8 @@ ngx_worker_thread(void *data)
                 }
             }
 
+            ngx_event_cancel_timers();
+
             if (ngx_event_timer_rbtree.root
                 == ngx_event_timer_rbtree.sentinel)
             {