Merge branch 'maint-0.4.7'

changes/ticket40703

@@ -0,0 +1,4 @@
+  o Minor feature (performance):
+    - Bump the maximum amount of CPU to use from 16 to 128. Note that NumCPUs
+      torrc option overrides this hardcoded maximum. Fixes bug 40703; bugfix on
+      0.3.5.1-alpha.

src/lib/thread/numcpus.c

@@ -70,7 +70,11 @@ compute_num_cpus_impl(void)
 #endif /* defined(_WIN32) || ... */
 }
 
-#define MAX_DETECTABLE_CPUS 16
+/** This is an arbitrary number but at this point in time, it is not that
+ * uncommon to see servers up to that amount of CPUs. Most servers will likely
+ * be around 16 to 32 cores now. Lets take advantage of large machines! The
+ * "NumCPUs" torrc option overrides this maximum. */
+#define MAX_DETECTABLE_CPUS 128
 
 /** Return how many CPUs we are running with.  We assume that nobody is
  * using hot-swappable CPUs, so we don't recompute this after the first

src/test/test_util.c

@@ -4987,7 +4987,7 @@ test_util_num_cpus(void *arg)
     tt_skip();
 
   tt_int_op(num, OP_GE, 1);
-  tt_int_op(num, OP_LE, 16);
+  tt_int_op(num, OP_LE, 128);
 
  done:
   ;