mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 09:42:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed ngx_connection_t.lock.

Browse Source
This commit is contained in:
Ruslan Ermilov 2015-03-20 06:43:19 +03:00
parent b6029a8a3f
commit f8d10849ad
5 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/ngx_connection.c
View File

@ -943,18 +943,6 @@ ngx_close_connection(ngx_connection_t *c)
} }
} }
#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) { if (c->read->posted) {
ngx_delete_posted_event(c->read); ngx_delete_posted_event(c->read);
} }

4
src/core/ngx_connection.h
View File

@ -187,10 +187,6 @@ struct ngx_connection_s {
#if (NGX_THREADS) #if (NGX_THREADS)
ngx_thread_task_t *sendfile_task; ngx_thread_task_t *sendfile_task;
#endif #endif
#if (NGX_OLD_THREADS)
ngx_atomic_t lock;
#endif
}; };

4
src/event/ngx_event.c
View File

@ -721,10 +721,6 @@ ngx_event_process_init(ngx_cycle_t *cycle)
c[i].fd = (ngx_socket_t) -1; c[i].fd = (ngx_socket_t) -1;
next = &c[i]; next = &c[i];
#if (NGX_OLD_THREADS)
c[i].lock = 0;
#endif
} while (i); } while (i);
cycle->free_connections = next; cycle->free_connections = next;

4
src/event/ngx_event_connect.h
View File

@ -53,10 +53,6 @@ struct ngx_peer_connection_s {
ngx_event_save_peer_session_pt save_session; ngx_event_save_peer_session_pt save_session;
#endif #endif
#if (NGX_OLD_THREADS)
ngx_atomic_t *lock;
#endif
ngx_addr_t *local; ngx_addr_t *local;
int rcvbuf; int rcvbuf;

3
src/http/ngx_http_upstream.c
View File

@ -446,9 +446,6 @@ ngx_http_upstream_create(ngx_http_request_t *r)
u->peer.log = r->connection->log; u->peer.log = r->connection->log;
u->peer.log_error = NGX_ERROR_ERR; u->peer.log_error = NGX_ERROR_ERR;
#if (NGX_OLD_THREADS)
u->peer.lock = &r->connection->lock;
#endif
#if (NGX_HTTP_CACHE) #if (NGX_HTTP_CACHE)
r->cache = NULL; r->cache = NULL;