aboutsummaryrefslogtreecommitdiff
path: root/src/event/ngx_event_accept.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/event/ngx_event_accept.c')
-rw-r--r--src/event/ngx_event_accept.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index 82d235b4e..26d6de005 100644
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -211,12 +211,14 @@ void ngx_event_accept(ngx_event_t *ev)
winstance = wev->returned_instance;
#if (NGX_THREADS)
- if (*(rev->lock)) {
+
+ if (*(&c->lock)) {
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0,
- "spinlock event " PTR_FMT " in accept", rev);
- ngx_spinlock(rev->lock, 1000);
- ngx_unlock(rev->lock);
+ "spinlock in accept, fd:%", s);
+ ngx_spinlock(&c->lock, 1000);
+ ngx_unlock(&c->lock);
}
+
#endif
ngx_memzero(rev, sizeof(ngx_event_t));
@@ -290,6 +292,8 @@ void ngx_event_accept(ngx_event_t *ev)
#if (NGX_THREADS)
rev->lock = &c->lock;
wev->lock = &c->lock;
+ rev->own_lock = &c->lock;
+ wev->own_lock = &c->lock;
#endif
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,