comparison src/event/ngx_event_connect.c @ 380:5ce6561246a5

nginx-0.0.7-2004-07-07-10:15:04 import
author Igor Sysoev <igor@sysoev.ru>
date Wed, 07 Jul 2004 06:15:04 +0000
parents 73688d5d7fc3
children 02a511569afb
comparison
equal deleted inserted replaced
379:73688d5d7fc3 380:5ce6561246a5
182 instance = rev->instance; 182 instance = rev->instance;
183 rinstance = rev->returned_instance; 183 rinstance = rev->returned_instance;
184 winstance = wev->returned_instance; 184 winstance = wev->returned_instance;
185 185
186 #if (NGX_THREADS) 186 #if (NGX_THREADS)
187 if (*(rev->lock)) { 187
188 if (*(&c->lock)) {
188 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pc->log, 0, 189 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pc->log, 0,
189 "spinlock event " PTR_FMT " in connect", rev); 190 "spinlock in connect, fd:%d", s);
190 ngx_spinlock(rev->lock, 1000); 191 ngx_spinlock(&c->lock, 1000);
191 ngx_unlock(rev->lock); 192 ngx_unlock(&c->lock);
192 } 193 }
194
193 #endif 195 #endif
194 196
195 ngx_memzero(c, sizeof(ngx_connection_t)); 197 ngx_memzero(c, sizeof(ngx_connection_t));
196 ngx_memzero(rev, sizeof(ngx_event_t)); 198 ngx_memzero(rev, sizeof(ngx_event_t));
197 ngx_memzero(wev, sizeof(ngx_event_t)); 199 ngx_memzero(wev, sizeof(ngx_event_t));
238 c->number = ngx_atomic_inc(ngx_connection_counter); 240 c->number = ngx_atomic_inc(ngx_connection_counter);
239 241
240 #if (NGX_THREADS) 242 #if (NGX_THREADS)
241 rev->lock = pc->lock; 243 rev->lock = pc->lock;
242 wev->lock = pc->lock; 244 wev->lock = pc->lock;
245 rev->own_lock = &c->lock;
246 wev->own_lock = &c->lock;
243 #endif 247 #endif
244 248
245 if (ngx_add_conn) { 249 if (ngx_add_conn) {
246 if (ngx_add_conn(c) == NGX_ERROR) { 250 if (ngx_add_conn(c) == NGX_ERROR) {
247 return NGX_ERROR; 251 return NGX_ERROR;