nginx-0.0.7-2004-06-30-19:30:41 import
diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c
index cc84d2e..379e530 100644
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -506,7 +506,6 @@
instance = (uintptr_t) ev & 1;
ev = (ngx_event_t *) ((uintptr_t) ev & (uintptr_t) ~1);
- ev->returned_instance = instance;
if (!ev->active || ev->instance != instance) {
@@ -520,6 +519,8 @@
continue;
}
+ ev->returned_instance = instance;
+
if (ev->log && (ev->log->log_level & NGX_LOG_DEBUG_CONNECTION)) {
ngx_kqueue_dump_event(ev->log, &event_list[i]);
}
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index 984570f..18f8586 100644
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -210,10 +210,31 @@
rinstance = rev->returned_instance;
winstance = wev->returned_instance;
+#if (NGX_THREADS)
+
+ /*
+ * We has to acquire the lock to avoid the race condition when
+ * the connection was just closed by another thread but its lock
+ * is not unlocked at this point and we got the same descriptor.
+ *
+ * The condition should be too rare.
+ */
+
+ if (ngx_trylock(&c->lock) == 0) {
+
+ /* TODO: ngx_cycle->stat.accept.spinlock++; */
+
+ ngx_spinlock(&c->lock, 1000);
+ }
+
+#endif
+
ngx_memzero(rev, sizeof(ngx_event_t));
ngx_memzero(wev, sizeof(ngx_event_t));
ngx_memzero(c, sizeof(ngx_connection_t));
+ /* ngx_memzero(c) does ngx_unlock(&c->lock); */
+
c->pool = pool;
c->listening = ls->listening;
diff --git a/src/event/ngx_event_posted.c b/src/event/ngx_event_posted.c
index 795aa61..0c91f4e 100644
--- a/src/event/ngx_event_posted.c
+++ b/src/event/ngx_event_posted.c
@@ -111,6 +111,9 @@
if (ev->posted) {
ev->posted = 0;
+ if (!ev->timedout) {
+ ev->ready = 1;
+ }
}
ev->event_handler(ev);
diff --git a/src/event/ngx_event_posted.h b/src/event/ngx_event_posted.h
index c2945c4..5059fa9 100644
--- a/src/event/ngx_event_posted.h
+++ b/src/event/ngx_event_posted.h
@@ -7,6 +7,19 @@
#include <ngx_event.h>
+typedef struct ngx_posted_events_s ngx_posted_event_t;
+
+struct ngx_posted_events_s {
+ ngx_event_t *event;
+ ngx_posted_event_t *next;
+
+ unsigned instance:1;
+ unsigned ready:1;
+ unsigned timedout:1;
+ unsigned complete:1;
+};
+
+
#define ngx_post_event(ev) \
if (!ev->posted) { \
ev->next = (ngx_event_t *) ngx_posted_events; \
@@ -14,6 +27,27 @@
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);\
+}} \
+\
+*/
+
void ngx_event_process_posted(ngx_cycle_t *cycle);
diff --git a/src/event/ngx_event_spinlock.c b/src/event/ngx_event_spinlock.c
deleted file mode 100644
index 58edb2a..0000000
--- a/src/event/ngx_event_spinlock.c
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-void _spinlock(ngx_atomic_t *lock)
-{
- ngx_int_t tries;
-
- tries = 0;
-
- for ( ;; ) {
-
- if (*lock) {
- if (ngx_ncpu > 1 && tries++ < 1000) {
- continue;
- }
-
- sched_yield();
- tries = 0;
-
- } else {
- if (ngx_atomic_cmp_set(lock, 0, 1)) {
- return;
- }
- }
- }
-}
-
