Author: mdounin
Date: 2012-12-10 16:00:55 +0000 (Mon, 10 Dec 2012)
New Revision: 4951
URL: http://trac.nginx.org/nginx/changeset/4951/nginx

Log:
Merge of r4913: fixed CPU affinity on respawn of dead workers.

Worker processes are now made aware of their sequential number needed
to select CPU affinity mask. This replaces a workaround from r4865.


Modified:
branches/stable-1.2/
branches/stable-1.2/src/os/unix/ngx_process_cycle.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2 2012-12-10 15:43:41 UTC (rev 4950)
+++ branches/stable-1.2 2012-12-10 16:00:55 UTC (rev 4951)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913
\ No newline at end of property
Modified: branches/stable-1.2/src/os/unix/ngx_process_cycle.c
===================================================================
--- branches/stable-1.2/src/os/unix/ngx_process_cycle.c 2012-12-10 15:43:41 UTC (rev 4950)
+++ branches/stable-1.2/src/os/unix/ngx_process_cycle.c 2012-12-10 16:00:55 UTC (rev 4951)
@@ -20,7 +20,7 @@
static ngx_uint_t ngx_reap_children(ngx_cycle_t *cycle);
static void ngx_master_process_exit(ngx_cycle_t *cycle);
static void ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data);
-static void ngx_worker_process_init(ngx_cycle_t *cycle, ngx_uint_t priority);
+static void ngx_worker_process_init(ngx_cycle_t *cycle, ngx_int_t worker);
static void ngx_worker_process_exit(ngx_cycle_t *cycle);
static void ngx_channel_handler(ngx_event_t *ev);
#if (NGX_THREADS)
@@ -62,7 +62,6 @@
#endif


-uint64_t cpu_affinity;
static u_char master_process[] = "master process";


@@ -360,19 +359,15 @@

for (i = 0; i < n; i++) {

- cpu_affinity = ngx_get_cpu_affinity(i);
+ ngx_spawn_process(cycle, ngx_worker_process_cycle,
+ (void *) (intptr_t) i, "worker process", type);

- ngx_spawn_process(cycle, ngx_worker_process_cycle, NULL,
- "worker process", type);
-
ch.pid = ngx_processes[ngx_process_slot].pid;
ch.slot = ngx_process_slot;
ch.fd = ngx_processes[ngx_process_slot].channel[0];

ngx_pass_open_channel(cycle, &ch);
}
-
- cpu_affinity = 0;
}


@@ -726,12 +721,14 @@
static void
ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data)
{
+ ngx_int_t worker = (intptr_t) data;
+
ngx_uint_t i;
ngx_connection_t *c;

ngx_process = NGX_PROCESS_WORKER;

- ngx_worker_process_init(cycle, 1);
+ ngx_worker_process_init(cycle, worker);

ngx_setproctitle("worker process");

@@ -837,9 +834,10 @@


static void
-ngx_worker_process_init(ngx_cycle_t *cycle, ngx_uint_t priority)
+ngx_worker_process_init(ngx_cycle_t *cycle, ngx_int_t worker)
{
sigset_t set;
+ uint64_t cpu_affinity;
ngx_int_t n;
ngx_uint_t i;
struct rlimit rlmt;
@@ -853,7 +851,7 @@

ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);

- if (priority && ccf->priority != 0) {
+ if (worker >= 0 && ccf->priority != 0) {
if (setpriority(PRIO_PROCESS, 0, ccf->priority) == -1) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
"setpriority(%d) failed", ccf->priority);
@@ -917,8 +915,12 @@
}
}

- if (cpu_affinity) {
- ngx_setaffinity(cpu_affinity, cycle->log);
+ if (worker >= 0) {
+ cpu_affinity = ngx_get_cpu_affinity(worker);
+
+ if (cpu_affinity) {
+ ngx_setaffinity(cpu_affinity, cycle->log);
+ }
}

#if (NGX_HAVE_PR_SET_DUMPABLE)
@@ -1298,7 +1300,7 @@

ngx_process = NGX_PROCESS_HELPER;

- ngx_worker_process_init(cycle, 0);
+ ngx_worker_process_init(cycle, -1);

ngx_close_listening_sockets(cycle);


_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel