diff options
| -rw-r--r-- | Makefile.PL | 6 | ||||
| -rw-r--r-- | lib/PublicInbox/V2Writable.pm | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Makefile.PL b/Makefile.PL index 8d90ad46..831649f9 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -156,12 +156,14 @@ WriteMakefile( ); sub MY::postamble { - <<EOF; + my $N = (`{ getconf _NPROCESSORS_ONLN || nproc; } 2>/dev/null` || 1); + $N += 1; # account for sleeps in some tests (and makes an IV) + <<EOF; PROVE = prove # support using eatmydata to speed up tests (apt-get install eatmydata): # https://www.flamingspork.com/projects/libeatmydata/ EATMYDATA = -N = \$\$(( \$\$(nproc 2>/dev/null || gnproc 2>/dev/null || echo 2) + 1 )) +N = $N -include config.mak $VARS -include Documentation/include.mk diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm index f7a318e5..dfcb4897 100644 --- a/lib/PublicInbox/V2Writable.pm +++ b/lib/PublicInbox/V2Writable.pm @@ -35,14 +35,13 @@ my $PACKING_FACTOR = 0.4; our $NPROC_MAX_DEFAULT = 4; sub detect_nproc () { - for my $nproc (qw(nproc gnproc)) { # GNU coreutils nproc - `$nproc 2>/dev/null` =~ /^(\d+)$/ and return $1; - } - # getconf(1) is POSIX, but *NPROCESSORS* vars are not for (qw(_NPROCESSORS_ONLN NPROCESSORS_ONLN)) { `getconf $_ 2>/dev/null` =~ /^(\d+)$/ and return $1; } + for my $nproc (qw(nproc gnproc)) { # GNU coreutils nproc + `$nproc 2>/dev/null` =~ /^(\d+)$/ and return $1; + } # should we bother with `sysctl hw.ncpu`? Those only give # us total processor count, not online processor count. |