summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2012-09-26 16:25:12 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2012-09-26 16:25:12 +0000
commit927643e3e9f8162004cc004e70796c95790ce3f6 (patch)
tree52be3bb36db665d7bba14b6dd38bad8c0f1067f4
parentf4473147e520706b20a43e818bacb5af4e78adca (diff)
downloadnginx-927643e3e9f8162004cc004e70796c95790ce3f6.tar.gz
nginx-927643e3e9f8162004cc004e70796c95790ce3f6.tar.bz2
Added clearing of cpu_affinity after process spawn.
This fixes unwanted/incorrect cpu_affinity use on dead worker processes respawn. While this is not ideal, it's expected to be better when previous situation where multiple processes were spawn with identical CPU affinity set. Reported by Charles Chen.
-rw-r--r--src/os/unix/ngx_process_cycle.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index 0474a26ca..4781d9c71 100644
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -371,6 +371,8 @@ ngx_start_worker_processes(ngx_cycle_t *cycle, ngx_int_t n, ngx_int_t type)
ngx_pass_open_channel(cycle, &ch);
}
+
+ cpu_affinity = 0;
}