nginx-0.0.1-2002-12-24-10:09:57 import

6 files changed, 35 insertions, 12 deletions

diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c
index 028dfe767..836ffe2e1 100644
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -61,7 +61,6 @@ int ngx_kqueue_add_event(ngx_event_t *ev, int event, u_int flags)
 {
     ev->oneshot = (flags & NGX_ONESHOT_EVENT) ? 1: 0;
 
-#if 1
     if (nchanges > 0
         && ev->index < nchanges
         && change_list[ev->index].udata == ev)
@@ -75,7 +74,6 @@ int ngx_kqueue_add_event(ngx_event_t *ev, int event, u_int flags)
 
         return NGX_OK;
     }
-#endif
 
     return ngx_kqueue_set_event(ev, event, EV_ADD | flags);
 }
@@ -140,10 +138,7 @@ int ngx_kqueue_set_event(ngx_event_t *ev, int filter, u_int flags)
     change_list[nchanges].data = 0;
     change_list[nchanges].udata = ev;
 
-#if 0
-    if (flags == EV_ADD)
-#endif
-        ev->index = nchanges;
+    ev->index = nchanges;
 
     nchanges++;
 
@@ -264,8 +259,10 @@ void ngx_kqueue_add_timer(ngx_event_t *ev, ngx_msec_t timer)
 {
     ngx_event_t *e;
 
-    ngx_log_debug(ev->log, "set timer: %d" _ timer);
-
+#if (NGX_DEBUG)
+    ngx_connection_t *c = (ngx_connection_t *) ev->data;
+    ngx_log_debug(ev->log, "set timer: %d:%d" _ c->fd _ timer);
+#endif
     ngx_assert((!ev->timer_next && !ev->timer_prev), return, ev->log,
                "timer already set");
 
diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c
index bff4960a2..1b7867dd4 100644
--- a/src/event/modules/ngx_poll_module.c
+++ b/src/event/modules/ngx_poll_module.c
@@ -190,7 +190,7 @@ int ngx_poll_process_events(ngx_log_t *log)
         }
     }
 
-    for (i = 0; ready; i++) {
+    for (i = 0; i < nevents && ready; i++) {
         c = &ngx_connections[event_list[i].fd];
 
         ngx_log_debug(log, "poll: fd:%d, ev:%d, rev:%d" _
@@ -245,6 +245,8 @@ int ngx_poll_process_events(ngx_log_t *log)
         }
     }
 
+    ngx_assert((ready == 0), /* void */ ; , log, "poll ready != nevents");
+
     return NGX_OK;
 }
 
diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c
index c75c71934..854e796dd 100644
--- a/src/event/modules/ngx_select_module.c
+++ b/src/event/modules/ngx_select_module.c
@@ -81,6 +81,12 @@ int ngx_select_add_event(ngx_event_t *ev, int event, u_int flags)
 
     ngx_log_debug(ev->log, "select fd:%d event:%d" _ c->fd _ event);
 
+    if (ev->index != NGX_INVALID_INDEX) {
+        ngx_log_error(NGX_LOG_ALERT, ev->log, 0,
+                      "%d:%d is already set", c->fd, event);
+        return NGX_OK;
+    }
+
 #if (WIN32)
     if ((event == NGX_READ_EVENT) && (max_read >= FD_SETSIZE)
         || (event == NGX_WRITE_EVENT) && (max_write >= FD_SETSIZE))
@@ -202,7 +208,7 @@ int ngx_select_process_events(ngx_log_t *log)
     for (i = 0; i < nevents; i++) {
         ev = event_index[i];
         c = (ngx_connection_t *) ev->data;
-        ngx_log_debug(log, "select: %d" _ c->fd);
+        ngx_log_debug(log, "select: %d:%d" _ c->fd _ ev->write);
     }
 #endif
 
@@ -305,6 +311,13 @@ void ngx_select_add_timer(ngx_event_t *ev, ngx_msec_t timer)
 {
     ngx_event_t *e;
 
+#if (NGX_DEBUG)
+    ngx_connection_t *c = (ngx_connection_t *) ev->data;
+    ngx_log_debug(ev->log, "set timer: %d:%d" _ c->fd _ timer);
+#endif
+    ngx_assert((!ev->timer_next && !ev->timer_prev), return, ev->log,
+               "timer already set");
+
     for (e = timer_queue.timer_next;
          e != &timer_queue && timer > e->timer_delta;
          e = e->timer_next)
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index b91a72afd..206fc14da 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -116,6 +116,7 @@ void ngx_pre_thread(ngx_array_t *ls, ngx_pool_t *pool, ngx_log_t *log)
         ngx_read_events[fd].data = &ngx_connections[fd];
         ngx_read_events[fd].event_handler = &ngx_event_accept;
         ngx_read_events[fd].listening = 1;
+        ev->index = NGX_INVALID_INDEX;
 
         ngx_read_events[fd].available = 0;
 
diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index 4575b0350..98a351c5b 100644
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -161,16 +161,23 @@ NGX_CLOSE_EVENT            kqueue: kqueue deletes events for file that closed
 
 static void ngx_inline ngx_del_timer(ngx_event_t *ev)
 {
-    if (ev->timer_prev)
+#if (NGX_DEBUG)
+    ngx_log_debug(ev->log, "del timer: %d" _ *(int *)(ev->data));
+#endif
+
+    if (ev->timer_prev) {
         ev->timer_prev->timer_next = ev->timer_next;
+    }
 
     if (ev->timer_next) {
+        ev->timer_next->timer_delta += ev->timer_delta;
         ev->timer_next->timer_prev = ev->timer_prev;
         ev->timer_next = NULL;
     }
 
-    if (ev->timer_prev)
+    if (ev->timer_prev) {
         ev->timer_prev = NULL;
+    }
 }
 
 
diff --git a/src/event/ngx_event_close.c b/src/event/ngx_event_close.c
index 66a3693a7..715a14b1a 100644
--- a/src/event/ngx_event_close.c
+++ b/src/event/ngx_event_close.c
@@ -18,6 +18,9 @@ int ngx_event_close_connection(ngx_event_t *ev)
 
     ngx_destroy_pool(c->pool);
 
+    ngx_del_timer(c->read);
+    ngx_del_timer(c->write);
+
     ngx_del_event(c->read, NGX_READ_EVENT, NGX_CLOSE_EVENT);
     ngx_del_event(c->write, NGX_WRITE_EVENT, NGX_CLOSE_EVENT);