diff options
| author | David Goulet <dgoulet@torproject.org> | 2022-10-31 11:21:21 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2022-10-31 11:21:21 -0400 |
| commit | fb15bf94f222119c8993632f372b5deb9b7259a0 (patch) | |
| tree | aa31299317940d2c9a320a2b6fc61a4349a87636 | |
| parent | 2eb875b4a0714ad31258fbce7ae27e99c6687b12 (diff) | |
| parent | 5db238f3e3df54b11cf376d57d2cd89257b594f8 (diff) | |
| download | tor-fb15bf94f222119c8993632f372b5deb9b7259a0.tar.gz tor-fb15bf94f222119c8993632f372b5deb9b7259a0.zip | |
Merge branch 'maint-0.4.7' into release-0.4.7
| -rw-r--r-- | changes/ticket40703 | 4 | ||||
| -rw-r--r-- | src/lib/thread/numcpus.c | 6 | ||||
| -rw-r--r-- | src/test/test_util.c | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/changes/ticket40703 b/changes/ticket40703 new file mode 100644 index 0000000000..f005f8f851 --- /dev/null +++ b/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. diff --git a/src/lib/thread/numcpus.c b/src/lib/thread/numcpus.c index 2c2589fdfe..e0ddb69931 100644 --- a/src/lib/thread/numcpus.c +++ b/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 diff --git a/src/test/test_util.c b/src/test/test_util.c index aa38d0fc5d..1dae2c617e 100644 --- a/src/test/test_util.c +++ b/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: ; |