nginx-0.0.1-2004-01-14-21:19:42 import

2 files changed, 12 insertions, 10 deletions

diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c
index f59138362..2f0d5c31f 100644
--- a/src/os/unix/ngx_process.c
+++ b/src/os/unix/ngx_process.c
@@ -106,13 +106,15 @@ static void ngx_exec_proc(ngx_cycle_t *cycle, void *data)
 }
 
 
-void ngx_signal_processes(ngx_cycle_t *cycle, ngx_int_t signo)
+#if 0
+
+void ngx_signal_processes(ngx_cycle_t *cycle)
 {
     ngx_uint_t  i;
 
     for (i = 0; i < ngx_last_process; i++) {
 
-        if (!ngx_processes[i].signal) {
+        if (ngx_processes[i].signal0 == 0) {
             continue;
         }
 
@@ -127,28 +129,29 @@ void ngx_signal_processes(ngx_cycle_t *cycle, ngx_int_t signo)
 
         ngx_log_debug2(NGX_LOG_DEBUG_CORE, cycle->log, 0,
                        "kill (" PID_T_FMT ", %d)" ,
-                       ngx_processes[i].pid, signo);
+                       ngx_processes[i].pid, ngx_processes[i].signal0);
 
-        if (kill(ngx_processes[i].pid, signo) == -1) {
+        if (kill(ngx_processes[i].pid, ngx_processes[i].signal0) == -1) {
             ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
-                          "kill(%d, %d) failed", ngx_processes[i].pid, signo);
+                          "kill(%d, %d) failed",
+                          ngx_processes[i].pid, ngx_processes[i].signal0);
             continue;
         }
 
-        if (signo != ngx_signal_value(NGX_REOPEN_SIGNAL)) {
+        if (ngx_processes[i].signal0 != ngx_signal_value(NGX_REOPEN_SIGNAL)) {
             ngx_processes[i].exiting = 1;
         }
     }
 }
 
+#endif
+
 
 void ngx_respawn_processes(ngx_cycle_t *cycle)
 {
     ngx_uint_t  i;
 
     for (i = 0; i < ngx_last_process; i++) {
-        ngx_log_debug1(NGX_LOG_DEBUG_CORE, cycle->log, 0,
-                       "proc table " PID_T_FMT, ngx_processes[i].pid);
 
         if (ngx_processes[i].exiting || !ngx_processes[i].exited) {
             continue;
diff --git a/src/os/unix/ngx_process.h b/src/os/unix/ngx_process.h
index 5b565091c..195d3fd75 100644
--- a/src/os/unix/ngx_process.h
+++ b/src/os/unix/ngx_process.h
@@ -8,6 +8,7 @@ typedef void (*ngx_spawn_proc_pt) (ngx_cycle_t *cycle, void *data);
 
 typedef struct {
     ngx_pid_t           pid;
+    int                 signal;
     int                 status;
 
     ngx_spawn_proc_pt   proc;
@@ -16,7 +17,6 @@ typedef struct {
 
     unsigned            respawn:1;
     unsigned            detached:1;
-    unsigned            signal:1;
     unsigned            exiting:1;
     unsigned            exited:1;
 } ngx_process_t;
@@ -47,7 +47,6 @@ ngx_pid_t ngx_spawn_process(ngx_cycle_t *cycle,
                             ngx_spawn_proc_pt proc, void *data,
                             char *name, ngx_int_t respawn);
 ngx_pid_t ngx_exec(ngx_cycle_t *cycle, ngx_exec_ctx_t *ctx);
-void ngx_signal_processes(ngx_cycle_t *cycle, ngx_int_t signo);
 void ngx_respawn_processes(ngx_cycle_t *cycle);
 void ngx_process_get_status(void);