Mercurial > hg > nginx

diff src/event/modules/ngx_poll_module.c @ 5820:3377f9459e99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Events: removed broken thread support from posted events. It's mostly dead code. And the idea of thread support for this task has been deprecated.
author Valentin Bartenev <vbart@nginx.com>
date Mon, 01 Sep 2014 18:20:03 +0400
parents 92490a725fef
children 3f5f0ab59b35
line wrap: on
line diff
--- a/src/event/modules/ngx_poll_module.c
+++ b/src/event/modules/ngx_poll_module.c
@@ -297,8 +297,6 @@ ngx_poll_process_events(ngx_cycle_t *cyc
         return NGX_ERROR;
     }
 
-    ngx_mutex_lock(ngx_posted_events_mutex);
-
     for (i = 0; i < nevents && ready; i++) {
 
         revents = event_list[i].revents;
@@ -372,31 +370,21 @@ ngx_poll_process_events(ngx_cycle_t *cyc
             found = 1;
 
             ev = c->read;
-
-            if ((flags & NGX_POST_THREAD_EVENTS) && !ev->accept) {
-                ev->posted_ready = 1;
+            ev->ready = 1;
 
-            } else {
-                ev->ready = 1;
-            }
+            queue = ev->accept ? &ngx_posted_accept_events
+                               : &ngx_posted_events;
 
-            queue = (ngx_event_t **) (ev->accept ? &ngx_posted_accept_events:
-                                                   &ngx_posted_events);
-            ngx_locked_post_event(ev, queue);
+            ngx_post_event(ev, queue);
         }
 
         if ((revents & POLLOUT) && c->write->active) {
             found = 1;
-            ev = c->write;
-
-            if (flags & NGX_POST_THREAD_EVENTS) {
-                ev->posted_ready = 1;
 
-            } else {
-                ev->ready = 1;
-            }
+            ev = c->write;
+            ev->ready = 1;
 
-            ngx_locked_post_event(ev, &ngx_posted_events);
+            ngx_post_event(ev, &ngx_posted_events);
         }
 
         if (found) {
@@ -405,8 +393,6 @@ ngx_poll_process_events(ngx_cycle_t *cyc
         }
     }
 
-    ngx_mutex_unlock(ngx_posted_events_mutex);
-
     if (ready != 0) {
         ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, "poll ready != events");
     }