nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug19968_029' into maint-0.2.9

Browse Source
This commit is contained in:
Nick Mathewson 2016-10-31 16:33:03 -04:00
commit e712b5d784
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
changes/bug19968 Normal file
View File

@ -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.

1
src/common/compat.c
View File

@ -2818,6 +2818,7 @@ compute_num_cpus(void)
"will not autodetect any more than %d, though. If you " "will not autodetect any more than %d, though. If you "
"want to configure more, set NumCPUs in your torrc", "want to configure more, set NumCPUs in your torrc",
num_cpus, MAX_DETECTABLE_CPUS); num_cpus, MAX_DETECTABLE_CPUS);
num_cpus = MAX_DETECTABLE_CPUS;
/* LCOV_EXCL_STOP */ /* LCOV_EXCL_STOP */
} }
} }