aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2012-01-16 11:13:48 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2012-01-16 11:13:48 +0000
commitb904676b5e687c8aeabcce297aa6250e07e63462 (patch)
tree23b25bf5f19aff05c4ef75d1174f501da02c2d7e /src
parent9572920af06cf50de76b25060948cac322458f9e (diff)
downloadnginx-b904676b5e687c8aeabcce297aa6250e07e63462.tar.gz
nginx-b904676b5e687c8aeabcce297aa6250e07e63462.zip
Fixed sched_setaffinity(2) to correctly pass size.
Second argument (cpusetsize) is size in bytes, not in bits. Previously used constant 32 resulted in reading of uninitialized memory and caused EINVAL to be returned on some Linux kernels.
Diffstat (limited to 'src')
-rw-r--r--src/os/unix/ngx_process_cycle.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index 863176fac..fbf18a5f2 100644
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -914,7 +914,10 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_uint_t priority)
ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0,
"sched_setaffinity(0x%08Xl)", cpu_affinity);
- if (sched_setaffinity(0, 32, (cpu_set_t *) &cpu_affinity) == -1) {
+ if (sched_setaffinity(0, sizeof(cpu_affinity),
+ (cpu_set_t *) &cpu_affinity)
+ == -1)
+ {
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
"sched_setaffinity(0x%08Xl) failed", cpu_affinity);
}