diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-04-29 16:34:26 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-04-29 16:34:26 +0000 |
| commit | 16abdfeda0509afbb220e75399f54b330b1a460c (patch) | |
| tree | 75e4268bd962bd0dd80a6d5d5e2858747e84134b /src | |
| parent | 8a956a65da71a3959c971c06cc9309f78c39c35c (diff) | |
| download | nginx-16abdfeda0509afbb220e75399f54b330b1a460c.tar.gz nginx-16abdfeda0509afbb220e75399f54b330b1a460c.zip | |
nginx-0.0.3-2004-04-29-20:34:26 import
Diffstat (limited to 'src')
| -rw-r--r-- | src/event/ngx_event.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c index b3f6a5620..18fa6b6ef 100644 --- a/src/event/ngx_event.c +++ b/src/event/ngx_event.c @@ -190,10 +190,7 @@ static ngx_int_t ngx_event_module_init(ngx_cycle_t *cycle) return NGX_ERROR; } - if (ecf->accept_mutex) { - ngx_accept_mutex_ptr = (ngx_atomic_t *) shared; - } - + ngx_accept_mutex_ptr = (ngx_atomic_t *) shared; ngx_connection_counter = (ngx_atomic_t *) (shared + 128); ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0, @@ -220,11 +217,10 @@ static ngx_int_t ngx_event_process_init(ngx_cycle_t *cycle) ngx_iocp_conf_t *iocpcf; #endif - ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module); ecf = ngx_event_get_conf(cycle->conf_ctx, ngx_event_core_module); - if (ccf->worker_processes > 1 && ngx_accept_mutex_ptr) { + if (ccf->worker_processes > 1 && ecf->accept_mutex) { ngx_accept_mutex = ngx_accept_mutex_ptr; ngx_accept_mutex_held = 1; ngx_accept_mutex_delay = ecf->accept_mutex_delay; |