nginx-0.0.7-2004-06-29-01:03:14 import

diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c
index 99370ac425c17392eedc7d9847979d1b471d268a..cc84d2eaa5038cbde48dd8ca4c1d54daf8a7f4db 100644 (file)
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -193,7 +193,8 @@ static ngx_int_t ngx_kqueue_add_event(ngx_event_t *ev, int event, u_int flags)
     ev->disabled = 0;
     ev->oneshot = (flags & NGX_ONESHOT_EVENT) ? 1 : 0;
 
-    if (nchanges > 0
+    if (ngx_thread_main()
+        && nchanges > 0
         && ev->index < (u_int) nchanges
         && ((uintptr_t) change_list[ev->index].udata & (uintptr_t) ~1)
                                                              == (uintptr_t) ev)
@@ -237,7 +238,8 @@ static ngx_int_t ngx_kqueue_del_event(ngx_event_t *ev, int event, u_int flags)
     ev->disabled = 0;
     ev->posted = 0;
 
-    if (nchanges > 0
+    if (ngx_thread_main()
+        && nchanges > 0
         && ev->index < (u_int) nchanges
         && ((uintptr_t) change_list[ev->index].udata & (uintptr_t) ~1)
                                                              == (uintptr_t) ev)
@@ -280,6 +282,7 @@ static ngx_int_t ngx_kqueue_set_event(ngx_event_t *ev, int filter, u_int flags)
 {
     struct timespec    ts;
     ngx_connection_t  *c;
+    struct kevent     *kev, kv;
 
     c = ev->data;
 
@@ -287,7 +290,7 @@ static ngx_int_t ngx_kqueue_set_event(ngx_event_t *ev, int filter, u_int flags)
                    "kevent set event: %d: ft:%d fl:%04X",
                    c->fd, filter, flags);
 
-    if (nchanges >= max_changes) {
+    if (ngx_thread_main() && nchanges >= max_changes) {
         ngx_log_error(NGX_LOG_WARN, ev->log, 0,
                       "kqueue change list is filled up");
 
@@ -302,40 +305,52 @@ static ngx_int_t ngx_kqueue_set_event(ngx_event_t *ev, int filter, u_int flags)
         nchanges = 0;
     }
 
-    change_list[nchanges].ident = c->fd;
-    change_list[nchanges].filter = filter;
-    change_list[nchanges].flags = flags;
-    change_list[nchanges].udata = (void *) ((uintptr_t) ev | ev->instance);
+    kev = ngx_thread_main() ? &change_list[nchanges] : &kv;
+
+    kev->ident = c->fd;
+    kev->filter = filter;
+    kev->flags = flags;
+    kev->udata = (void *) ((uintptr_t) ev | ev->instance);
 
     if (filter == EVFILT_VNODE) {
-        change_list[nchanges].fflags = NOTE_DELETE|NOTE_WRITE|NOTE_EXTEND
-                                       |NOTE_ATTRIB|NOTE_RENAME
+        kev->fflags = NOTE_DELETE|NOTE_WRITE|NOTE_EXTEND
+                                 |NOTE_ATTRIB|NOTE_RENAME
 #if (__FreeBSD__ == 4 && __FreeBSD_version >= 430000) \
     || __FreeBSD_version >= 500018
-                                       |NOTE_REVOKE
+                                 |NOTE_REVOKE
 #endif
                                        ;
-        change_list[nchanges].data = 0;
+        kev->data = 0;
 
     } else {
 #if (HAVE_LOWAT_EVENT)
         if (flags & NGX_LOWAT_EVENT) {
-            change_list[nchanges].fflags = NOTE_LOWAT;
-            change_list[nchanges].data = ev->available;
+            kev->fflags = NOTE_LOWAT;
+            kev->data = ev->available;
 
         } else {
-            change_list[nchanges].fflags = 0;
-            change_list[nchanges].data = 0;
+            kev->fflags = 0;
+            kev->data = 0;
         }
 #else
-        change_list[nchanges].fflags = 0;
-        change_list[nchanges].data = 0;
+        kev->fflags = 0;
+        kev->data = 0;
 #endif
     }
 
-    ev->index = nchanges;
+    if (ngx_thread_main()) {
+        ev->index = nchanges;
+        nchanges++;
+
+    } else {
+        ts.tv_sec = 0;
+        ts.tv_nsec = 0;
 
-    nchanges++;
+        if (kevent(ngx_kqueue, &kv, 1, NULL, 0, &ts) == -1) {
+            ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno, "kevent() failed");
+            return NGX_ERROR;
+        }
+    }
 
     return NGX_OK;
 }

diff --git a/src/event/ngx_event_posted.c b/src/event/ngx_event_posted.c
index b103159b013d2d305dcf4e1bab88cd9c8fd07bbc..795aa61712c78ae45ab881eb74ed78d61c1068ab 100644 (file)
--- a/src/event/ngx_event_posted.c
+++ b/src/event/ngx_event_posted.c
@@ -92,13 +92,16 @@ ngx_int_t ngx_event_thread_process_posted(ngx_cycle_t *cycle)
                 || (ev->use_instance && ev->instance != ev->returned_instance))
             {
                 /*
-                 * the stale event from a file descriptor
-                 * that was just closed in this iteration
+                 * The stale event from a file descriptor that was just
+                 * closed in this iteration.  We use ngx_cycle->log
+                 * because ev->log may be already destoyed.
                  */
 
-                ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0,
+                ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0,
                                "kevent: stale event " PTR_FMT, ev);
 
+                ngx_unlock(ev->lock);
+
                 ev = ev->next;
 
                 continue;

diff --git a/src/event/ngx_event_posted.h b/src/event/ngx_event_posted.h
index ba484fac02c184f502c80921f9639c48ad3cfa19..c2945c4ff1f5d43fd591f350e1b7fbc67a0df5f5 100644 (file)
--- a/src/event/ngx_event_posted.h
+++ b/src/event/ngx_event_posted.h
@@ -8,9 +8,11 @@
 
 
 #define ngx_post_event(ev)                                                    \
+            if (!ev->posted) {                                                \
                 ev->next = (ngx_event_t *) ngx_posted_events;                 \
                 ngx_posted_events = ev;                                       \
-                ev->posted = 1;
+                ev->posted = 1;                                               \
+            }
 
 
 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 0f6de679308c133b5761ca27888bfc43817d6021..893b2a9e10601673d5f299b092d506808386ebec 100644 (file)
--- a/src/event/ngx_event_timer.c
+++ b/src/event/ngx_event_timer.c
@@ -87,9 +87,11 @@ void ngx_event_expire_timers(ngx_msec_t timer)
             ev = (ngx_event_t *)
                            ((char *) node - offsetof(ngx_event_t, rbtree_key));
 
+#if (NGX_THREADS)
             if (ngx_trylock(ev->lock) == 0) {
                 break;
             }
+#endif
 
             ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
                            "event timer del: %d: %d",
@@ -109,7 +111,9 @@ void ngx_event_expire_timers(ngx_msec_t timer)
 
             ev->timer_set = 0;
             ev->timedout = 1;
+#if (NGX_THREADS)
             ngx_unlock(ev->lock);
+#endif
 
             if (ngx_threaded) {
                 if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) {

diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 4bff8cc8a39354a67234dfa14358095f43505941..fe1eaabccea0de44de60f2f921978fbeee84f03d 100644 (file)
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -1708,6 +1708,8 @@ void ngx_http_close_request(ngx_http_request_t *r, int error)
 
 void ngx_http_close_connection(ngx_connection_t *c)
 {
+    ngx_socket_t  fd;
+
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
                    "close http connection: %d", c->fd);
 
@@ -1737,16 +1739,25 @@ void ngx_http_close_connection(ngx_connection_t *c)
         }
     }
 
-    if (ngx_close_socket(c->fd) == -1) {
-        ngx_log_error(NGX_LOG_ALERT, c->log, ngx_socket_errno,
-                      ngx_close_socket_n " failed");
-    }
+    fd = c->fd;
 
     c->fd = (ngx_socket_t) -1;
     c->data = NULL;
-
     ngx_destroy_pool(c->pool);
 
+    /*
+     * we has to clean the connection before the closing because another thread
+     * may reopen the same file descriptor before we clean the connection
+     */
+
+    if (ngx_close_socket(fd) == -1) {
+
+        /* we use ngx_cycle->log because c->log was in c->pool */
+
+        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_socket_errno,
+                      ngx_close_socket_n " failed");
+    }
+
     return;
 }
 

diff --git a/src/os/unix/ngx_freebsd_rfork_thread.c b/src/os/unix/ngx_freebsd_rfork_thread.c
index 73c5152214c5facb3ab129a1b6b0afa3742e9ad2..2c8dc69d0e695d7d2683614732c60b2d43ed3372 100644 (file)
--- a/src/os/unix/ngx_freebsd_rfork_thread.c
+++ b/src/os/unix/ngx_freebsd_rfork_thread.c
@@ -399,6 +399,10 @@ ngx_int_t ngx_mutex_dolock(ngx_mutex_t *m, ngx_int_t try)
                     return NGX_ERROR;
                 }
 
+                ngx_log_debug2(NGX_LOG_DEBUG_CORE, m->log, 0,
+                               "mutex waked up " PTR_FMT " lock:%X",
+                               m, m->lock);
+
                 tries = 0;
                 old = m->lock;
                 continue;
@@ -505,6 +509,9 @@ ngx_int_t ngx_mutex_unlock(ngx_mutex_t *m)
 
             /* wake up the thread that waits on semaphore */
 
+            ngx_log_debug1(NGX_LOG_DEBUG_CORE, m->log, 0,
+                           "wake up mutex " PTR_FMT "", m);
+
             op.sem_num = 0;
             op.sem_op = 1;
             op.sem_flg = SEM_UNDO;

diff --git a/src/os/unix/ngx_thread.h b/src/os/unix/ngx_thread.h
index c91ff99864abeac490f43eef0e2e9135b00c54d7..a1404038e0054fe7dc22d8a51250a2422db3c10e 100644 (file)
--- a/src/os/unix/ngx_thread.h
+++ b/src/os/unix/ngx_thread.h
@@ -77,6 +77,8 @@ static inline int ngx_gettid()
 }
 
 
+#define ngx_thread_main()   (ngx_gettid() == 0)
+
 
 #else /* use pthreads */
 
@@ -124,6 +126,10 @@ ngx_int_t ngx_cond_signal(ngx_cond_t *cv);
 #define ngx_mutex_lock(m)     NGX_OK
 #define ngx_mutex_unlock(m)
 
+#define ngx_cond_signal(cv)
+
+#define ngx_thread_main()     1
+
 #endif