4 files changed, 24 insertions, 7 deletions
diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c
index 9ef39d852..865b343a6 100644
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -279,9 +279,9 @@ static ngx_int_t ngx_kqueue_del_event(ngx_event_t *ev, int event, u_int flags)
 
 static ngx_int_t ngx_kqueue_set_event(ngx_event_t *ev, int filter, u_int flags)
 {
+    struct kevent     *kev, kv;
     struct timespec    ts;
     ngx_connection_t  *c;
-    struct kevent     *kev, kv;
 
     c = ev->data;
 
@@ -370,7 +370,7 @@ static ngx_int_t ngx_kqueue_process_events(ngx_cycle_t *cycle)
     for ( ;; ) {
         timer = ngx_event_find_timer();
 
-#if (NGX_THREADS)
+#if (NGX_THREADS0)
         if (timer == NGX_TIMER_ERROR) {
             return NGX_ERROR;
         }
@@ -621,7 +621,7 @@ static ngx_int_t ngx_kqueue_process_events(ngx_cycle_t *cycle)
 
     if (ngx_posted_events) {
         if (ngx_threaded) {
-            ngx_cond_signal(ngx_posted_events_cv);
+            ngx_wakeup_worker_thread(cycle);
 
         } else {
             ngx_event_process_posted(cycle);
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 1d1a9cee1..bf748f174 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -91,7 +91,7 @@ ngx_module_t  ngx_events_module = {
     ngx_events_commands,                   /* module directives */
     NGX_CORE_MODULE,                       /* module type */
     NULL,                                  /* init module */
-    NULL                                   /* init child */
+    NULL                                   /* init process */
 };
 
 
diff --git a/src/event/ngx_event_posted.c b/src/event/ngx_event_posted.c
index f3ac0da05..71853edf4 100644
--- a/src/event/ngx_event_posted.c
+++ b/src/event/ngx_event_posted.c
@@ -8,7 +8,6 @@ ngx_thread_volatile ngx_event_t  *ngx_posted_events;
 
 #if (NGX_THREADS)
 ngx_mutex_t                      *ngx_posted_events_mutex;
-ngx_cond_t                       *ngx_posted_events_cv;
 #endif
 
 
@@ -57,6 +56,19 @@ void ngx_event_process_posted(ngx_cycle_t *cycle)
 
 #if (NGX_THREADS)
 
+void ngx_wakeup_worker_thread(ngx_cycle_t *cycle)
+{
+    ngx_int_t  i;
+
+    for (i = 0; i < ngx_threads_n; i++) {
+        if (ngx_threads[i].state == NGX_THREAD_FREE) {
+            ngx_cond_signal(ngx_threads[i].cv);
+            return;
+        }
+    }
+}
+
+
 ngx_int_t ngx_event_thread_process_posted(ngx_cycle_t *cycle)
 {
     ngx_event_t  *ev;
@@ -71,7 +83,6 @@ ngx_int_t ngx_event_thread_process_posted(ngx_cycle_t *cycle)
                           "posted event " PTR_FMT, ev);
 
             if (ev == NULL) {
-                ngx_mutex_unlock(ngx_posted_events_mutex);
                 return NGX_OK;
             }
 
@@ -144,4 +155,10 @@ ngx_int_t ngx_event_thread_process_posted(ngx_cycle_t *cycle)
     }
 }
 
+#else
+
+void ngx_wakeup_worker_thread(ngx_cycle_t *cycle)
+{
+}
+
 #endif
diff --git a/src/event/ngx_event_posted.h b/src/event/ngx_event_posted.h
index f04a98339..cb916dbe1 100644
--- a/src/event/ngx_event_posted.h
+++ b/src/event/ngx_event_posted.h
@@ -26,6 +26,7 @@
 
 
 void ngx_event_process_posted(ngx_cycle_t *cycle);
+void ngx_wakeup_worker_thread(ngx_cycle_t *cycle);
 
 extern ngx_thread_volatile ngx_event_t  *ngx_posted_events;
 
@@ -34,7 +35,6 @@ extern ngx_thread_volatile ngx_event_t  *ngx_posted_events;
 ngx_int_t ngx_event_thread_process_posted(ngx_cycle_t *cycle);
 
 extern ngx_mutex_t                      *ngx_posted_events_mutex;
-extern ngx_cond_t                       *ngx_posted_events_cv;
 #endif