summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2012-11-12 17:54:49 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2012-11-12 17:54:49 +0000
commit41bdb0f93d059238c9a2987858f19047ebf87bc3 (patch)
tree1d8c9cbdf04ac6eec87d79f056fb78d39d3e79d9
parentde68f145bf583e2319809f39ba0807e32f536213 (diff)
downloadnginx-41bdb0f93d059238c9a2987858f19047ebf87bc3.tar.gz
nginx-41bdb0f93d059238c9a2987858f19047ebf87bc3.tar.bz2
Merge of r4865: 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;
}