diff options
Diffstat (limited to 'src/event')
| -rw-r--r-- | src/event/ngx_event_accept.c | 10 | ||||
| -rw-r--r-- | src/event/ngx_event_timer.c | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c index e73741011..779fdadcc 100644 --- a/src/event/ngx_event_accept.c +++ b/src/event/ngx_event_accept.c @@ -254,17 +254,17 @@ void ngx_event_accept(ngx_event_t *ev) /* * TODO: MT: - atomic increment (x86: lock xadd) - * or protection by critical section or mutex + * or protection by critical section or light mutex * * TODO: MP: - allocated in a shared memory * - atomic increment (x86: lock xadd) - * or protection by critical section or mutex + * or protection by critical section or light mutex */ - c->number = ngx_connection_counter++; + c->number = ngx_atomic_inc(&ngx_connection_counter); ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0, - "accept: %d, %d", s, c->number); + "accept: fd:%d c:%d", s, c->number); if (ngx_add_conn) { if (ngx_add_conn(c) == NGX_ERROR) { @@ -292,8 +292,6 @@ void ngx_event_accept(ngx_event_t *ev) accepted++; } while (ev->available); - - return; } diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c index 5e866a491..e002cb7eb 100644 --- a/src/event/ngx_event_timer.c +++ b/src/event/ngx_event_timer.c @@ -9,6 +9,10 @@ * protected by the single mutex */ +#if (NGX_THREADS) +static ngx_mutex_t *ngx_event_timer_mutex; +#endif + ngx_rbtree_t *ngx_event_timer_rbtree; ngx_rbtree_t ngx_event_timer_sentinel; |