mirror of
https://github.com/nginx/nginx.git
synced 2025-06-07 09:42:39 +08:00
nginx-0.0.3-2004-04-29-20:34:26 import
This commit is contained in:
parent
8a956a65da
commit
16abdfeda0
@ -190,10 +190,7 @@ static ngx_int_t ngx_event_module_init(ngx_cycle_t *cycle)
|
|||||||
return NGX_ERROR;
|
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_connection_counter = (ngx_atomic_t *) (shared + 128);
|
||||||
|
|
||||||
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
|
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;
|
ngx_iocp_conf_t *iocpcf;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
|
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);
|
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 = ngx_accept_mutex_ptr;
|
||||||
ngx_accept_mutex_held = 1;
|
ngx_accept_mutex_held = 1;
|
||||||
ngx_accept_mutex_delay = ecf->accept_mutex_delay;
|
ngx_accept_mutex_delay = ecf->accept_mutex_delay;
|
||||||
|
Loading…
Reference in New Issue
Block a user