commit becc95783979cf1879e6390aad80781d0ce3ea66 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Oct 31 14:19:39 2016 -0400 Actually clamp the number of detected CPUs to 16. Previously we said we did, but didn't. Fixes #19968; bugfix on 0.2.3.1-alpha. --- changes/bug19968 | 11 +++++++++++ src/common/compat.c | 1 + 2 files changed, 12 insertions(+) diff --git a/changes/bug19968 b/changes/bug19968 new file mode 100644 index 0000000..b285706 --- /dev/null +++ b/changes/bug19968 @@ -0,0 +1,11 @@ + o Minor bugfixes (relay): + - Do not try to parallelize workers more than 16x without the + user explicitly configuring us to do so, even if we do detect more than + 16 CPU cores. Fixes bug 19968; bugfix on + 0.2.3.1-alpha. + + + o Minor bugfixes (testing): + - Avoid a unit test failure on systems with over 16 detectable + CPU cores. Fixes bug 19968; bugfix on + 0.2.3.1-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index 3fde2b3..4f2f977 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2818,6 +2818,7 @@ compute_num_cpus(void) "will not autodetect any more than %d, though. If you " "want to configure more, set NumCPUs in your torrc", num_cpus, MAX_DETECTABLE_CPUS); + num_cpus = MAX_DETECTABLE_CPUS; /* LCOV_EXCL_STOP */ } }