diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-09-07 15:31:20 +0400 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-09-07 15:31:20 +0400 |
| commit | 14d92237d13a4d28251e75619946279df4a19cc9 (patch) | |
| tree | 5fc9882161d0930868e7b2464b4863aca4008736 | |
| parent | bfa9302e8976db62f6628a255016314f450b5e5b (diff) | |
merge r3047, r3048, r3049:
twice termination delay only after SIGALRM, otherwise many separate SIGCHLD
and SIGIO signals quickly increase delay to the level when SIGKILL is sent
| -rw-r--r-- | src/core/ngx_string.c | 2 | ||||
| -rw-r--r-- | src/os/unix/ngx_process.c | 1 | ||||
| -rw-r--r-- | src/os/unix/ngx_process_cycle.c | 11 | ||||
| -rw-r--r-- | src/os/unix/ngx_process_cycle.h | 1 |
4 files changed, 10 insertions, 5 deletions
diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c index d73cb8699..e73dc41d8 100644 --- a/src/core/ngx_string.c +++ b/src/core/ngx_string.c @@ -87,7 +87,7 @@ ngx_pstrdup(ngx_pool_t *pool, ngx_str_t *src) * * reserved: * %t ptrdiff_t - * %S null-teminated wchar string + * %S null-terminated wchar string * %C wchar */ diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c index 7446c138b..c480d6899 100644 --- a/src/os/unix/ngx_process.c +++ b/src/os/unix/ngx_process.c @@ -359,6 +359,7 @@ ngx_signal_handler(int signo) break; case SIGALRM: + ngx_sigalrm = 1; break; case SIGIO: diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c index 92f6bf6f3..1ee278fe8 100644 --- a/src/os/unix/ngx_process_cycle.c +++ b/src/os/unix/ngx_process_cycle.c @@ -34,6 +34,7 @@ ngx_uint_t ngx_threaded; sig_atomic_t ngx_reap; sig_atomic_t ngx_sigio; +sig_atomic_t ngx_sigalrm; sig_atomic_t ngx_terminate; sig_atomic_t ngx_quit; sig_atomic_t ngx_debug_quit; @@ -130,10 +131,13 @@ ngx_master_process_cycle(ngx_cycle_t *cycle) for ( ;; ) { if (delay) { - delay *= 2; + if (ngx_sigalrm) { + delay *= 2; + ngx_sigalrm = 0; + } ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, - "temination cycle: %d", delay); + "termination cycle: %d", delay); itv.it_interval.tv_sec = 0; itv.it_interval.tv_usec = 0; @@ -492,8 +496,7 @@ ngx_signal_worker_processes(ngx_cycle_t *cycle, int signo) if (kill(ngx_processes[i].pid, signo) == -1) { err = ngx_errno; ngx_log_error(NGX_LOG_ALERT, cycle->log, err, - "kill(%P, %d) failed", - ngx_processes[i].pid, signo); + "kill(%P, %d) failed", ngx_processes[i].pid, signo); if (err == NGX_ESRCH) { ngx_processes[i].exited = 1; diff --git a/src/os/unix/ngx_process_cycle.h b/src/os/unix/ngx_process_cycle.h index c52b6f0e1..9bf04749f 100644 --- a/src/os/unix/ngx_process_cycle.h +++ b/src/os/unix/ngx_process_cycle.h @@ -39,6 +39,7 @@ extern ngx_uint_t ngx_exiting; extern sig_atomic_t ngx_reap; extern sig_atomic_t ngx_sigio; +extern sig_atomic_t ngx_sigalrm; extern sig_atomic_t ngx_quit; extern sig_atomic_t ngx_debug_quit; extern sig_atomic_t ngx_terminate; |