mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

nginx-0.0.3-2004-06-04-18:57:33 import

Browse Source
This commit is contained in:
Igor Sysoev 2004-06-04 14:57:33 +00:00
parent 67f450d7bc
commit 6e1bbd7896
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
auto/cc
View File

@ -4,7 +4,8 @@ CFLAGS="$CFLAGS $CC_OPT"
case $CC in case $CC in
*gcc*) *gcc*)
# gcc 2.7.2.3, 2.8.1, 2.95.4, 3.3.2, 3.3.3, 3.4 # gcc 2.7.2.3, 2.8.1, 2.95.4,
# 3.2.3, 3.3.2, 3.3.3, 3.3.4, 3.4
# optimization # optimization
#CFLAGS="$CFLAGS -O2 -fomit-frame-pointer" #CFLAGS="$CFLAGS -O2 -fomit-frame-pointer"
@ -89,7 +90,7 @@ case $CC in
*icc) *icc)
# Intel C++ compiler 7.1 # Intel C++ compiler 7.1, 8.0
# optimization # optimization
CFLAGS="$CFLAGS -O" CFLAGS="$CFLAGS -O"
@ -241,7 +242,7 @@ case $CC in
wcl386) wcl386)
# Open Watcom C 1.0 # Open Watcom C 1.0, 1.2
# optimization # optimization

16
src/event/ngx_event.c
View File

@ -223,7 +223,7 @@ static ngx_int_t ngx_event_process_init(ngx_cycle_t *cycle)
if (ngx_accept_mutex_ptr && ccf->worker_processes > 1 && ecf->accept_mutex) if (ngx_accept_mutex_ptr && 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 = 0;
ngx_accept_mutex_delay = ecf->accept_mutex_delay; ngx_accept_mutex_delay = ecf->accept_mutex_delay;
} }
@ -371,15 +371,13 @@ static ngx_int_t ngx_event_process_init(ngx_cycle_t *cycle)
rev->event_handler = &ngx_event_accept; rev->event_handler = &ngx_event_accept;
if (ngx_accept_mutex) {
continue;
}
if (ngx_event_flags & NGX_USE_SIGIO_EVENT) { if (ngx_event_flags & NGX_USE_SIGIO_EVENT) {
if (ngx_add_conn(c) == NGX_ERROR) {
if (ngx_accept_mutex) { return NGX_ERROR;
ngx_accept_mutex_held = 0;
} else {
if (ngx_add_conn(c) == NGX_ERROR) {
return NGX_ERROR;
}
} }
} else { } else {

10
src/os/unix/ngx_process_cycle.c
View File

@ -514,7 +514,10 @@ static void ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data)
&& ngx_event_timer_rbtree == &ngx_event_timer_sentinel) && ngx_event_timer_rbtree == &ngx_event_timer_sentinel)
{ {
ngx_log_error(NGX_LOG_INFO, cycle->log, 0, "exiting"); ngx_log_error(NGX_LOG_INFO, cycle->log, 0, "exiting");
ngx_destroy_pool(cycle->pool); /*
* we do not destroy cycle->pool here because a signal handler
* that uses cycle->log can be called at this point
*/
exit(0); exit(0);
} }
@ -524,7 +527,10 @@ static void ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data)
if (ngx_terminate) { if (ngx_terminate) {
ngx_log_error(NGX_LOG_INFO, cycle->log, 0, "exiting"); ngx_log_error(NGX_LOG_INFO, cycle->log, 0, "exiting");
ngx_destroy_pool(cycle->pool); /*
* we do not destroy cycle->pool here because a signal handler
* that uses cycle->log can be called at this point
*/
exit(0); exit(0);
} }