Mercurial > hg > nginx

changeset 6031:c8acea7c7041

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed ngx_connection_t.lock.
author Ruslan Ermilov <ru@nginx.com>
date Fri, 20 Mar 2015 06:43:19 +0300
parents 4652f8f26b12
children ac7c7241ed8c
files src/core/ngx_connection.c src/core/ngx_connection.h src/event/ngx_event.c src/event/ngx_event_connect.h src/http/ngx_http_upstream.c
diffstat 5 files changed, 0 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_connection.c	Fri Mar 20 06:43:19 2015 +0300
+++ b/src/core/ngx_connection.c	Fri Mar 20 06:43:19 2015 +0300
@@ -943,18 +943,6 @@
         }
     }
 
-#if (NGX_OLD_THREADS)
-
-    /*
-     * we have to clean the connection information before the closing
-     * because another thread may reopen the same file descriptor
-     * before we clean the connection
-     */
-
-    ngx_unlock(&c->lock);
-
-#endif
-
     if (c->read->posted) {
         ngx_delete_posted_event(c->read);
     }
--- a/src/core/ngx_connection.h	Fri Mar 20 06:43:19 2015 +0300
+++ b/src/core/ngx_connection.h	Fri Mar 20 06:43:19 2015 +0300
@@ -187,10 +187,6 @@
 #if (NGX_THREADS)
     ngx_thread_task_t  *sendfile_task;
 #endif
-
-#if (NGX_OLD_THREADS)
-    ngx_atomic_t        lock;
-#endif
 };
 
 
--- a/src/event/ngx_event.c	Fri Mar 20 06:43:19 2015 +0300
+++ b/src/event/ngx_event.c	Fri Mar 20 06:43:19 2015 +0300
@@ -721,10 +721,6 @@
         c[i].fd = (ngx_socket_t) -1;
 
         next = &c[i];
-
-#if (NGX_OLD_THREADS)
-        c[i].lock = 0;
-#endif
     } while (i);
 
     cycle->free_connections = next;
--- a/src/event/ngx_event_connect.h	Fri Mar 20 06:43:19 2015 +0300
+++ b/src/event/ngx_event_connect.h	Fri Mar 20 06:43:19 2015 +0300
@@ -53,10 +53,6 @@
     ngx_event_save_peer_session_pt   save_session;
 #endif
 
-#if (NGX_OLD_THREADS)
-    ngx_atomic_t                    *lock;
-#endif
-
     ngx_addr_t                      *local;
 
     int                              rcvbuf;
--- a/src/http/ngx_http_upstream.c	Fri Mar 20 06:43:19 2015 +0300
+++ b/src/http/ngx_http_upstream.c	Fri Mar 20 06:43:19 2015 +0300
@@ -446,9 +446,6 @@
 
     u->peer.log = r->connection->log;
     u->peer.log_error = NGX_ERROR_ERR;
-#if (NGX_OLD_THREADS)
-    u->peer.lock = &r->connection->lock;
-#endif
 
 #if (NGX_HTTP_CACHE)
     r->cache = NULL;