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

12 files changed, 126 insertions, 125 deletions

diff --git a/src/event/modules/ngx_devpoll_module.c b/src/event/modules/ngx_devpoll_module.c
index 7e272ff8d..d5b8afc07 100644
--- a/src/event/modules/ngx_devpoll_module.c
+++ b/src/event/modules/ngx_devpoll_module.c
@@ -236,7 +236,6 @@ static int ngx_devpoll_del_event(ngx_event_t *ev, int event, u_int flags)
     }
 
     ev->active = 0;
-    ev->posted = 0;
 
     if (flags & NGX_CLOSE_EVENT) {
         return NGX_OK;
diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c
index a8e51c646..af34b7262 100644
--- a/src/event/modules/ngx_epoll_module.c
+++ b/src/event/modules/ngx_epoll_module.c
@@ -264,7 +264,6 @@ static int ngx_epoll_del_event(ngx_event_t *ev, int event, u_int flags)
 
     if (flags & NGX_CLOSE_EVENT) {
         ev->active = 0;
-        ev->posted = 0;
         return NGX_OK;
     }
 
@@ -301,7 +300,6 @@ static int ngx_epoll_del_event(ngx_event_t *ev, int event, u_int flags)
     }
 
     ev->active = 0;
-    ev->posted = 0;
 
     return NGX_OK;
 }
diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c
index c9ef3b8ab..9ef39d852 100644
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -237,12 +237,6 @@ static ngx_int_t ngx_kqueue_del_event(ngx_event_t *ev, int event, u_int flags)
     ev->active = 0;
     ev->disabled = 0;
 
-    if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) {
-        return NGX_ERROR;
-    } 
-    ev->posted = 0;
-    ngx_mutex_unlock(ngx_posted_events_mutex);
-
     if (ngx_thread_main()
         && nchanges > 0
         && ev->index < (u_int) nchanges
@@ -512,7 +506,7 @@ static ngx_int_t ngx_kqueue_process_events(ngx_cycle_t *cycle)
             instance = (uintptr_t) ev & 1;
             ev = (ngx_event_t *) ((uintptr_t) ev & (uintptr_t) ~1);
 
-            if (!ev->active || ev->instance != instance) {
+            if (ev->closed || ev->instance != instance) {
 
                 /*
                  * the stale event from a file descriptor
@@ -530,7 +524,9 @@ static ngx_int_t ngx_kqueue_process_events(ngx_cycle_t *cycle)
 
             ev->returned_instance = instance;
 
-            if (!ev->accept && (ngx_threaded || ngx_accept_mutex_held)) {
+#if (NGX_THREADS)
+
+            if (ngx_threaded && !ev->accept) {
                 ev->posted_ready = 1;
                 ev->posted_available += event_list[i].data;
 
@@ -544,10 +540,12 @@ static ngx_int_t ngx_kqueue_process_events(ngx_cycle_t *cycle)
                 continue;
             }
 
+#endif
+
             ev->available = event_list[i].data;
 
             if (event_list[i].flags & EV_EOF) {
-                ev->kq_eof = 1;
+                ev->pending_eof = 1;
                 ev->kq_errno = event_list[i].fflags;
             }
 
@@ -578,12 +576,10 @@ static ngx_int_t ngx_kqueue_process_events(ngx_cycle_t *cycle)
             continue;
         }
 
-#if 0
         if (!ev->accept) {
             ngx_post_event(ev);
             continue;
         }
-#endif
 
         if (ngx_accept_disabled > 0) {
             continue;
diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c
index 64f7cec74..7c4afc84d 100644
--- a/src/event/modules/ngx_poll_module.c
+++ b/src/event/modules/ngx_poll_module.c
@@ -181,7 +181,6 @@ static ngx_int_t ngx_poll_del_event(ngx_event_t *ev, int event, u_int flags)
     c = ev->data;
 
     ev->active = 0;
-    ev->posted = 0;
 
     if (ev->index == NGX_INVALID_INDEX) {
         ngx_log_error(NGX_LOG_ALERT, ev->log, 0,
diff --git a/src/event/modules/ngx_rtsig_module.c b/src/event/modules/ngx_rtsig_module.c
index feaf2717c..5ab17ce15 100644
--- a/src/event/modules/ngx_rtsig_module.c
+++ b/src/event/modules/ngx_rtsig_module.c
@@ -249,8 +249,6 @@ static ngx_int_t ngx_rtsig_del_connection(ngx_connection_t *c, u_int flags)
     if (flags & NGX_CLOSE_EVENT) {
         c->read->active = 0;
         c->write->active = 0;
-        c->read->posted = 0;
-        c->write->posted = 0;
         return NGX_OK;
     }
 
@@ -262,8 +260,6 @@ static ngx_int_t ngx_rtsig_del_connection(ngx_connection_t *c, u_int flags)
 
     c->read->active = 0;
     c->write->active = 0;
-    c->read->posted = 0;
-    c->write->posted = 0;
 
     return NGX_OK;
 }
diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c
index 4d50427a5..2998ae25b 100644
--- a/src/event/modules/ngx_select_module.c
+++ b/src/event/modules/ngx_select_module.c
@@ -203,7 +203,6 @@ static ngx_int_t ngx_select_del_event(ngx_event_t *ev, int event, u_int flags)
     c = ev->data;
 
     ev->active = 0;
-    ev->posted = 0;
 
     if (ev->index == NGX_INVALID_INDEX) {
         return NGX_OK;
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 58a5f0f70..1d1a9cee1 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -276,12 +276,22 @@ static ngx_int_t ngx_event_process_init(ngx_cycle_t *cycle)
         return NGX_ERROR;
     }
 
+    rev = cycle->read_events;
+    for (i = 0; i < cycle->connection_n; i++) {
+        rev[i].closed = 1;
+    }
+
     cycle->write_events = ngx_alloc(sizeof(ngx_event_t) * ecf->connections,
                                    cycle->log);
     if (cycle->write_events == NULL) {
         return NGX_ERROR;
     }
 
+    wev = cycle->write_events;
+    for (i = 0; i < cycle->connection_n; i++) {
+        wev[i].closed = 1;
+    }
+
     /* for each listening socket */
 
     s = cycle->listening.elts;
diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index d3a96bd6e..15654379c 100644
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -34,89 +34,57 @@ typedef struct {
 struct ngx_event_s {
     void            *data;
 
-    /* TODO rename to handler */
-    ngx_event_handler_pt  event_handler;
-
-    u_int            index;
-
-    /* the link of the posted queue or the event mutecies queues */
-    ngx_event_t     *next;
+    unsigned         write:1;
 
-    ngx_log_t       *log;
+    unsigned         accept:1;
 
-    /*
-     * The inline of "ngx_rbtree_t  rbtree;".
-     *
-     * It allows to pack the rbtree_color and the various event bit flags into
-     * the single "int".  We also use "unsigned char" and then "unsigned short"
-     * because otherwise MSVC 6.0 uses an additional "int" for the bit flags.
-     * We use "char rbtree_color" instead of "unsigned int rbtree_color:1"
-     * because it preserves the bits order on the big endian platforms.
-     */
-
-    ngx_int_t        rbtree_key;
-    void            *rbtree_left;
-    void            *rbtree_right;
-    void            *rbtree_parent;
-    char             rbtree_color;
-
-    unsigned char    oneshot:1;
-
-    unsigned char    write:1;
+    unsigned         oneshot:1;
 
     /* used to detect the stale events in kqueue, rt signals and epoll */
-    unsigned char    use_instance:1;
-    unsigned char    instance:1;
-    unsigned char    returned_instance:1;
+    unsigned         use_instance:1;
+    unsigned         instance:1;
+    unsigned         returned_instance:1;
 
     /*
      * the event was passed or would be passed to a kernel;
      * in aio mode - operation was posted.
      */
-    unsigned char    active:1;
+    unsigned         active:1;
 
-    unsigned char    disabled:1;
-
-    unsigned char    posted:1;
+    unsigned         disabled:1;
 
     /* the ready event; in aio mode 0 means that no operation can be posted */
-    unsigned short   ready:1;
+    unsigned         ready:1;
 
     /* aio operation is complete */
-    unsigned short   complete:1;
-
-    unsigned short   eof:1;
-    unsigned short   error:1;
-
-    unsigned short   timedout:1;
-    unsigned short   timer_set:1;
+    unsigned         complete:1;
 
-    unsigned short   delayed:1;
+    unsigned         eof:1;
+    unsigned         error:1;
 
-    unsigned short   read_discarded:1;
+    unsigned         timedout:1;
+    unsigned         timer_set:1;
 
-    unsigned short   unexpected_eof:1;
+    unsigned         delayed:1;
 
-    unsigned short   accept:1;
+    unsigned         read_discarded:1;
 
-    unsigned short   deferred_accept:1;
+    unsigned         unexpected_eof:1;
 
-    unsigned short   overflow:1;
+    unsigned         deferred_accept:1;
 
-    /* TODO: aio_eof and kq_eof can be the single pending_eof */
-    /* the pending eof in aio chain operation */
-    unsigned short   aio_eof:1;
+    unsigned         overflow:1;
 
-    /* the pending eof reported by kqueue */
-    unsigned short   kq_eof:1;
+    /* the pending eof reported by kqueue or in aio chain operation */
+    unsigned         pending_eof:1;
 
 #if (WIN32)
     /* setsockopt(SO_UPDATE_ACCEPT_CONTEXT) was succesfull */
-    unsigned short   accept_context_updated:1;
+    unsigned         accept_context_updated:1;
 #endif
 
 #if (HAVE_KQUEUE)
-    unsigned short   kq_vnode:1;
+    unsigned         kq_vnode:1;
 
     /* the pending errno reported by kqueue */
     int              kq_errno;
@@ -139,9 +107,12 @@ struct ngx_event_s {
 #if (HAVE_KQUEUE) || (HAVE_IOCP)
     int              available;
 #else
-    unsigned short   available:1;
+    unsigned         available:1;
 #endif
 
+    /* TODO rename to handler */
+    ngx_event_handler_pt  event_handler;
+
 
 #if (HAVE_AIO)
 
@@ -153,10 +124,26 @@ struct ngx_event_s {
 
 #endif
 
+    u_int            index;
 
-#if (NGX_THREADS)
+    ngx_log_t       *log;
 
-    ngx_atomic_t    *lock;
+    /* TODO: threads: padding to cache line */
+
+    /*
+     * STUB: The inline of "ngx_rbtree_t  rbtree;"
+     */
+
+    ngx_int_t        rbtree_key;
+    void            *rbtree_left;
+    void            *rbtree_right;
+    void            *rbtree_parent;
+    char             rbtree_color;
+
+
+    unsigned         closed:1;
+
+#if (NGX_THREADS)
 
     unsigned         locked:1;
 
@@ -175,8 +162,14 @@ struct ngx_event_s {
     unsigned         posted_available:1;
 #endif
 
+    ngx_atomic_t    *lock;
+
 #endif
 
+    /* the links of the posted queue */
+    ngx_event_t     *next;
+    ngx_event_t    **prev;
+
 
 #if 0
 
diff --git a/src/event/ngx_event_pipe.c b/src/event/ngx_event_pipe.c
index 372cf53a8..e324a230a 100644
--- a/src/event/ngx_event_pipe.c
+++ b/src/event/ngx_event_pipe.c
@@ -120,7 +120,7 @@ ngx_int_t ngx_event_pipe_read_upstream(ngx_event_pipe_t *p)
              */
 
             if (p->upstream->read->available == 0
-                && (p->upstream->read->kq_eof || p->upstream->read->aio_eof))
+                && p->upstream->read->pending_eof)
             {
                 p->upstream->read->ready = 0;
                 p->upstream->read->eof = 0;
diff --git a/src/event/ngx_event_posted.c b/src/event/ngx_event_posted.c
index 975079fc5..f3ac0da05 100644
--- a/src/event/ngx_event_posted.c
+++ b/src/event/ngx_event_posted.c
@@ -27,13 +27,17 @@ void ngx_event_process_posted(ngx_cycle_t *cycle)
             return;
         }
 
-        ngx_posted_events = ev->next;
+        ngx_delete_posted_event(ev);
+
+#if 0
+        /* do not check instance ??? */
 
         if (ev->accept) {
             continue;
         }
+#endif
 
-        if ((!ev->posted && !ev->active)
+        if (ev->closed
             || (ev->use_instance && ev->instance != ev->returned_instance))
         {
             /*
@@ -46,10 +50,6 @@ void ngx_event_process_posted(ngx_cycle_t *cycle)
             continue;
         }
 
-        if (ev->posted) {
-            ev->posted = 0;
-        }
-
         ev->event_handler(ev);
     }
 }
@@ -59,12 +59,11 @@ void ngx_event_process_posted(ngx_cycle_t *cycle)
 
 ngx_int_t ngx_event_thread_process_posted(ngx_cycle_t *cycle)
 {
-    ngx_event_t  *ev, **ep;
+    ngx_event_t  *ev;
 
     for ( ;; ) {
 
         ev = (ngx_event_t *) ngx_posted_events;
-        ep = (ngx_event_t **) &ngx_posted_events;
 
         for ( ;; ) {
 
@@ -76,23 +75,22 @@ ngx_int_t ngx_event_thread_process_posted(ngx_cycle_t *cycle)
                 return NGX_OK;
             }
 
-            ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
-                          "posted event lock:%d " PTR_FMT,
-                          *(ev->lock), ev->lock);
-
             if (ngx_trylock(ev->lock) == 0) {
 
                 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
                                "posted event " PTR_FMT " is busy", ev);
 
-                ep = &ev->next;
                 ev = ev->next;
                 continue;
             }
 
-            *ep = ev->next;
+            ngx_delete_posted_event(ev);
 
-            if ((!ev->posted && !ev->active)
+            ngx_log_debug3(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
+                          "event instance: c:%d i:%d r:%d",
+                          ev->closed, ev->instance, ev->returned_instance);
+
+            if (ev->closed
                 || (ev->use_instance && ev->instance != ev->returned_instance))
             {
                 /*
@@ -102,7 +100,7 @@ ngx_int_t ngx_event_thread_process_posted(ngx_cycle_t *cycle)
                  */
 
                 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0,
-                               "kevent: stale event " PTR_FMT, ev);
+                               "stale posted event " PTR_FMT, ev);
 
                 ngx_unlock(ev->lock);
 
@@ -113,16 +111,21 @@ ngx_int_t ngx_event_thread_process_posted(ngx_cycle_t *cycle)
 
             ev->locked = 1;
 
-            if (ev->posted) {
-                ev->ready = ev->posted_ready;
-                ev->timedout = ev->posted_timedout;
-                ev->available = ev->posted_available;
-                ev->kq_eof = ev->posted_eof;
+            ev->ready |= ev->posted_ready;
+            ev->timedout |= ev->posted_timedout;
+            ev->available |= ev->posted_available;
+            ev->pending_eof |= ev->posted_eof;
 #if (HAVE_KQUEUE)
-                ev->kq_errno = ev->posted_errno;
+            ev->kq_errno |= ev->posted_errno;
+#endif
+
+            ev->posted_ready = 0;
+            ev->posted_timedout = 0;
+            ev->posted_available = 0;
+            ev->posted_eof = 0;
+#if (HAVE_KQUEUE)
+            ev->posted_errno = 0;
 #endif
-                ev->posted = 0;
-            }
 
             ngx_mutex_unlock(ngx_posted_events_mutex);
 
diff --git a/src/event/ngx_event_posted.h b/src/event/ngx_event_posted.h
index 9d9f70220..f04a98339 100644
--- a/src/event/ngx_event_posted.h
+++ b/src/event/ngx_event_posted.h
@@ -8,29 +8,21 @@
 
 
 #define ngx_post_event(ev)                                                    \
-            if (!ev->posted) {                                                \
+            if (ev->prev == NULL) {                                           \
                 ev->next = (ngx_event_t *) ngx_posted_events;                 \
+                ev->prev = (ngx_event_t **) &ngx_posted_events;               \
                 ngx_posted_events = ev;                                       \
-                ev->posted = 1;                                               \
-\
-   ngx_log_debug3(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0, \
-               "POST: %08X %08X %08X", ngx_posted_events, \
-               (ngx_posted_events ? ngx_posted_events->next: 0), \
-               ((ngx_posted_events && ngx_posted_events->next) ? \
-                               ngx_posted_events->next->next: 0)); \
-\
-}
-
-/*
-\
-{ int i; ngx_event_t *e;\
-  e = (ngx_event_t *) ngx_posted_events; \
-for (i = 0; e && i < 10; e = e->next, i++) { \
-   ngx_log_debug2(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0, \
-                  "POST: %d %08X", i, e);\
-}} \
-\
-*/
+                ngx_log_debug1(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0,         \
+                               "post event " PTR_FMT, ev);                    \
+            }
+
+#define ngx_delete_posted_event(ev)                                           \
+        *(ev->prev) = ev->next;                                               \
+        if (ev->next) {                                                       \
+            ev->next->prev = ev->prev;                                        \
+        }                                                                     \
+        ev->prev = NULL;
+
 
 
 void ngx_event_process_posted(ngx_cycle_t *cycle);
diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c
index c10e23069..0b3822009 100644
--- a/src/event/ngx_event_timer.c
+++ b/src/event/ngx_event_timer.c
@@ -88,7 +88,17 @@ void ngx_event_expire_timers(ngx_msec_t timer)
                            ((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 @@ void ngx_event_expire_timers(ngx_msec_t timer)
 
             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;