Mercurial > hg > nginx

changeset 3358:f94e8ff65aa2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add NGX_PROCESS_HELPER process status
author Igor Sysoev <igor@sysoev.ru>
date Mon, 23 Nov 2009 15:46:21 +0000
parents fc735aa50b8b
children e68b1c35cad8
files src/core/ngx_connection.c src/event/modules/ngx_poll_module.c src/event/modules/ngx_select_module.c src/event/modules/ngx_win32_select_module.c src/os/unix/ngx_process.c src/os/unix/ngx_process_cycle.c src/os/unix/ngx_process_cycle.h src/os/win32/ngx_process.h src/os/win32/ngx_process_cycle.h
diffstat 9 files changed, 14 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_connection.c	Mon Nov 23 14:09:57 2009 +0000
+++ b/src/core/ngx_connection.c	Mon Nov 23 15:46:21 2009 +0000
@@ -634,7 +634,7 @@
 #if (NGX_HAVE_UNIX_DOMAIN)
 
         if (ls[i].sockaddr->sa_family == AF_UNIX
-            && ngx_process != NGX_PROCESS_WORKER
+            && ngx_process <= NGX_PROCESS_MASTER
             && ngx_new_binary == 0)
         {
             u_char *name = ls[i].addr_text.data + sizeof("unix:") - 1;
--- a/src/event/modules/ngx_poll_module.c	Mon Nov 23 14:09:57 2009 +0000
+++ b/src/event/modules/ngx_poll_module.c	Mon Nov 23 15:46:21 2009 +0000
@@ -72,7 +72,7 @@
         nevents = 0;
     }
 
-    if (ngx_process == NGX_PROCESS_WORKER
+    if (ngx_process >= NGX_PROCESS_WORKER
         || cycle->old_cycle == NULL
         || cycle->old_cycle->connection_n < cycle->connection_n)
     {
--- a/src/event/modules/ngx_select_module.c	Mon Nov 23 14:09:57 2009 +0000
+++ b/src/event/modules/ngx_select_module.c	Mon Nov 23 15:46:21 2009 +0000
@@ -81,7 +81,7 @@
         nevents = 0;
     }
 
-    if (ngx_process == NGX_PROCESS_WORKER
+    if (ngx_process >= NGX_PROCESS_WORKER
         || cycle->old_cycle == NULL
         || cycle->old_cycle->connection_n < cycle->connection_n)
     {
--- a/src/event/modules/ngx_win32_select_module.c	Mon Nov 23 14:09:57 2009 +0000
+++ b/src/event/modules/ngx_win32_select_module.c	Mon Nov 23 15:46:21 2009 +0000
@@ -82,7 +82,7 @@
         nevents = 0;
     }
 
-    if (ngx_process == NGX_PROCESS_WORKER
+    if (ngx_process >= NGX_PROCESS_WORKER
         || cycle->old_cycle == NULL
         || cycle->old_cycle->connection_n < cycle->connection_n)
     {
--- a/src/os/unix/ngx_process.c	Mon Nov 23 14:09:57 2009 +0000
+++ b/src/os/unix/ngx_process.c	Mon Nov 23 15:46:21 2009 +0000
@@ -388,6 +388,7 @@
         break;
 
     case NGX_PROCESS_WORKER:
+    case NGX_PROCESS_HELPER:
         switch (signo) {
 
         case ngx_signal_value(NGX_NOACCEPT_SIGNAL):
--- a/src/os/unix/ngx_process_cycle.c	Mon Nov 23 14:09:57 2009 +0000
+++ b/src/os/unix/ngx_process_cycle.c	Mon Nov 23 15:46:21 2009 +0000
@@ -714,6 +714,8 @@
     ngx_uint_t         i;
     ngx_connection_t  *c;
 
+    ngx_process = NGX_PROCESS_WORKER;
+
     ngx_worker_process_init(cycle, 1);
 
     ngx_setproctitle("worker process");
@@ -829,8 +831,6 @@
     ngx_core_conf_t  *ccf;
     ngx_listening_t  *ls;
 
-    ngx_process = NGX_PROCESS_WORKER;
-
     if (ngx_set_environment(cycle, NULL) == NULL) {
         /* fatal */
         exit(2);
@@ -1289,6 +1289,8 @@
 
     cycle->connection_n = 512;
 
+    ngx_process = NGX_PROCESS_HELPER;
+
     ngx_worker_process_init(cycle, 0);
 
     ngx_close_listening_sockets(cycle);
--- a/src/os/unix/ngx_process_cycle.h	Mon Nov 23 14:09:57 2009 +0000
+++ b/src/os/unix/ngx_process_cycle.h	Mon Nov 23 15:46:21 2009 +0000
@@ -21,8 +21,9 @@
 
 #define NGX_PROCESS_SINGLE     0
 #define NGX_PROCESS_MASTER     1
-#define NGX_PROCESS_WORKER     2
-#define NGX_PROCESS_SIGNALLER  3
+#define NGX_PROCESS_SIGNALLER  2
+#define NGX_PROCESS_WORKER     3
+#define NGX_PROCESS_HELPER     4
 
 
 typedef struct {
--- a/src/os/win32/ngx_process.h	Mon Nov 23 14:09:57 2009 +0000
+++ b/src/os/win32/ngx_process.h	Mon Nov 23 15:46:21 2009 +0000
@@ -48,11 +48,6 @@
 } ngx_exec_ctx_t;
 
 
-#define NGX_PROCESS_SINGLE  0
-#define NGX_PROCESS_MASTER  1
-#define NGX_PROCESS_WORKER  2
-
-
 ngx_pid_t ngx_spawn_process(ngx_cycle_t *cycle, char *name, ngx_int_t respawn);
 ngx_pid_t ngx_execute(ngx_cycle_t *cycle, ngx_exec_ctx_t *ctx);
 
--- a/src/os/win32/ngx_process_cycle.h	Mon Nov 23 14:09:57 2009 +0000
+++ b/src/os/win32/ngx_process_cycle.h	Mon Nov 23 15:46:21 2009 +0000
@@ -14,8 +14,8 @@
 
 #define NGX_PROCESS_SINGLE     0
 #define NGX_PROCESS_MASTER     1
-#define NGX_PROCESS_WORKER     2
-#define NGX_PROCESS_SIGNALLER  3
+#define NGX_PROCESS_SIGNALLER  2
+#define NGX_PROCESS_WORKER     3
 
 
 void ngx_master_process_cycle(ngx_cycle_t *cycle);