瀏覽代碼

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.
Nick Mathewson 7 年之前
父節點
當前提交
becc957839
共有 2 個文件被更改,包括 12 次插入0 次删除
  1. 11 0
      changes/bug19968
  2. 1 0
      src/common/compat.c

+ 11 - 0
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.

+ 1 - 0
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 */
     }
   }