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

src/event/modules/ngx_kqueue_module.c

diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c
index 028dfe7..836ffe2 100644
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -61,7 +61,6 @@
 {
     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 @@
 
         return NGX_OK;
     }
-#endif
 
     return ngx_kqueue_set_event(ev, event, EV_ADD | flags);
 }
@@ -140,10 +138,7 @@
     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 @@
 {
     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");
 

src/event/modules/ngx_poll_module.c

diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c
index bff4960..1b7867d 100644
--- a/src/event/modules/ngx_poll_module.c
+++ b/src/event/modules/ngx_poll_module.c
@@ -190,7 +190,7 @@
         }
     }
 
-    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 @@
         }
     }
 
+    ngx_assert((ready == 0), /* void */ ; , log, "poll ready != nevents");
+
     return NGX_OK;
 }
 

src/event/modules/ngx_select_module.c

diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c
index c75c719..854e796 100644
--- a/src/event/modules/ngx_select_module.c
+++ b/src/event/modules/ngx_select_module.c
@@ -81,6 +81,12 @@
 
     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 @@
     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 @@
 {
     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)