summaryrefslogtreecommitdiffhomepage
path: root/src/event/modules/ngx_poll_module.c
diff options
context:
space:
mode:
authorValentin Bartenev <vbart@nginx.com>2014-09-01 18:20:03 +0400
committerValentin Bartenev <vbart@nginx.com>2014-09-01 18:20:03 +0400
commit2a81e0556611188a1b9b3e1240a06928dcebc1a2 (patch)
tree59f0296dff877b77b7f22c0c5955f31014d3c164 /src/event/modules/ngx_poll_module.c
parent3ca3f609cb7d9bc5576bf9fb77998cf110b688cb (diff)
downloadnginx-2a81e0556611188a1b9b3e1240a06928dcebc1a2.tar.gz
nginx-2a81e0556611188a1b9b3e1240a06928dcebc1a2.tar.bz2
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.
Diffstat (limited to 'src/event/modules/ngx_poll_module.c')
-rw-r--r--src/event/modules/ngx_poll_module.c28
1 files changed, 7 insertions, 21 deletions
diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c
index 9db6b6c4d..f2fc749f7 100644
--- 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 *cycle, ngx_msec_t timer, ngx_uint_t flags)
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 *cycle, ngx_msec_t timer, ngx_uint_t flags)
found = 1;
ev = c->read;
+ ev->ready = 1;
- if ((flags & NGX_POST_THREAD_EVENTS) && !ev->accept) {
- ev->posted_ready = 1;
+ queue = ev->accept ? &ngx_posted_accept_events
+ : &ngx_posted_events;
- } else {
- ev->ready = 1;
- }
-
- 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 *cycle, ngx_msec_t timer, ngx_uint_t flags)
}
}
- ngx_mutex_unlock(ngx_posted_events_mutex);
-
if (ready != 0) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, "poll ready != events");
}