diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-07-07 06:15:04 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-07-07 06:15:04 +0000 |
| commit | c78c41cefcf1e1fa8005f81b7c6cc0c857bcf46f (patch) | |
| tree | 167a534227a7b4203892a0bb1a493a7fd4af6279 /src/event/ngx_event_connect.c | |
| parent | 81a432a185bc61d46a4d5eb1f96773ee7b3dc6a3 (diff) | |
| download | nginx-c78c41cefcf1e1fa8005f81b7c6cc0c857bcf46f.tar.gz nginx-c78c41cefcf1e1fa8005f81b7c6cc0c857bcf46f.tar.bz2 | |
nginx-0.0.7-2004-07-07-10:15:04 import
Diffstat (limited to 'src/event/ngx_event_connect.c')
| -rw-r--r-- | src/event/ngx_event_connect.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c index c84dcbc5e..4aabea97e 100644 --- a/src/event/ngx_event_connect.c +++ b/src/event/ngx_event_connect.c @@ -184,12 +184,14 @@ int ngx_event_connect_peer(ngx_peer_connection_t *pc) winstance = wev->returned_instance; #if (NGX_THREADS) - if (*(rev->lock)) { + + if (*(&c->lock)) { ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pc->log, 0, - "spinlock event " PTR_FMT " in connect", rev); - ngx_spinlock(rev->lock, 1000); - ngx_unlock(rev->lock); + "spinlock in connect, fd:%d", s); + ngx_spinlock(&c->lock, 1000); + ngx_unlock(&c->lock); } + #endif ngx_memzero(c, sizeof(ngx_connection_t)); @@ -240,6 +242,8 @@ int ngx_event_connect_peer(ngx_peer_connection_t *pc) #if (NGX_THREADS) rev->lock = pc->lock; wev->lock = pc->lock; + rev->own_lock = &c->lock; + wev->own_lock = &c->lock; #endif if (ngx_add_conn) { |