diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2015-05-20 15:51:21 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2015-05-20 15:51:21 +0300 |
| commit | 68b3d28c55e8c24c9998a4292b40c4fbe4afc36f (patch) | |
| tree | a4207e46f5e66c6817b3fca5226657c013bfdbc2 | |
| parent | e58321a4cae2642b0ce8af11a22b606652cd4b50 (diff) | |
| download | nginx-68b3d28c55e8c24c9998a4292b40c4fbe4afc36f.tar.gz nginx-68b3d28c55e8c24c9998a4292b40c4fbe4afc36f.zip | |
Introduced worker number, ngx_worker.
| -rw-r--r-- | src/os/unix/ngx_process_cycle.c | 2 | ||||
| -rw-r--r-- | src/os/unix/ngx_process_cycle.h | 1 | ||||
| -rw-r--r-- | src/os/win32/ngx_process_cycle.c | 1 | ||||
| -rw-r--r-- | src/os/win32/ngx_process_cycle.h | 1 |
4 files changed, 5 insertions, 0 deletions
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c index 50676326f..c69932ecd 100644 --- a/src/os/unix/ngx_process_cycle.c +++ b/src/os/unix/ngx_process_cycle.c @@ -29,6 +29,7 @@ static void ngx_cache_loader_process_handler(ngx_event_t *ev); ngx_uint_t ngx_process; +ngx_uint_t ngx_worker; ngx_pid_t ngx_pid; sig_atomic_t ngx_reap; @@ -731,6 +732,7 @@ ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data) ngx_connection_t *c; ngx_process = NGX_PROCESS_WORKER; + ngx_worker = worker; ngx_worker_process_init(cycle, worker); diff --git a/src/os/unix/ngx_process_cycle.h b/src/os/unix/ngx_process_cycle.h index d44c377ce..69495d5f4 100644 --- a/src/os/unix/ngx_process_cycle.h +++ b/src/os/unix/ngx_process_cycle.h @@ -39,6 +39,7 @@ void ngx_single_process_cycle(ngx_cycle_t *cycle); extern ngx_uint_t ngx_process; +extern ngx_uint_t ngx_worker; extern ngx_pid_t ngx_pid; extern ngx_pid_t ngx_new_binary; extern ngx_uint_t ngx_inherited; diff --git a/src/os/win32/ngx_process_cycle.c b/src/os/win32/ngx_process_cycle.c index acd70cf78..203bece3f 100644 --- a/src/os/win32/ngx_process_cycle.c +++ b/src/os/win32/ngx_process_cycle.c @@ -29,6 +29,7 @@ static ngx_thread_value_t __stdcall ngx_cache_loader_thread(void *data); ngx_uint_t ngx_process; +ngx_uint_t ngx_worker; ngx_pid_t ngx_pid; ngx_uint_t ngx_inherited; diff --git a/src/os/win32/ngx_process_cycle.h b/src/os/win32/ngx_process_cycle.h index f38c38885..95d274350 100644 --- a/src/os/win32/ngx_process_cycle.h +++ b/src/os/win32/ngx_process_cycle.h @@ -25,6 +25,7 @@ void ngx_close_handle(HANDLE h); extern ngx_uint_t ngx_process; +extern ngx_uint_t ngx_worker; extern ngx_pid_t ngx_pid; extern ngx_uint_t ngx_exiting; |