summaryrefslogtreecommitdiffhomepage
path: root/src/core
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/core
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/core')
-rw-r--r--src/core/ngx_connection.c21
-rw-r--r--src/core/ngx_resolver.c11
2 files changed, 1 insertions, 31 deletions
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index 4c42ffc0d..7b3daf20a 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -951,26 +951,9 @@ ngx_close_connection(ngx_connection_t *c)
* before we clean the connection
*/
- ngx_mutex_lock(ngx_posted_events_mutex);
-
- if (c->read->prev) {
- ngx_delete_posted_event(c->read);
- }
-
- if (c->write->prev) {
- ngx_delete_posted_event(c->write);
- }
-
- c->read->closed = 1;
- c->write->closed = 1;
-
ngx_unlock(&c->lock);
- c->read->locked = 0;
- c->write->locked = 0;
-
- ngx_mutex_unlock(ngx_posted_events_mutex);
-#else
+#endif
if (c->read->prev) {
ngx_delete_posted_event(c->read);
@@ -983,8 +966,6 @@ ngx_close_connection(ngx_connection_t *c)
c->read->closed = 1;
c->write->closed = 1;
-#endif
-
ngx_reusable_connection(c, 0);
log_error = c->log_error;
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index 5f7897853..a17793b13 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -3082,17 +3082,6 @@ ngx_udp_connect(ngx_udp_connection_t *uc)
c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
-#if (NGX_THREADS)
-
- /* TODO: lock event when call completion handler */
-
- rev->lock = &c->lock;
- wev->lock = &c->lock;
- rev->own_lock = &c->lock;
- wev->own_lock = &c->lock;
-
-#endif
-
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, &uc->log, 0,
"connect to %V, fd:%d #%uA", &uc->server, s, c->number);