treewide: run update-copyrights from gnulib for 2019

[public-inbox.git] / lib / PublicInbox / V2Writable.pm

diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 37d27302565e17b66586b00e5742a6b2ef451f41..fc2f33f9dd2cd09f48b89cc5d2629ae2f1e6f3b7 100644 (file)
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # This interface wraps and mimics PublicInbox::Import
@@ -7,6 +7,7 @@ package PublicInbox::V2Writable;
 use strict;
 use warnings;
 use base qw(PublicInbox::Lock);
+use 5.010_001;
 use PublicInbox::SearchIdxShard;
 use PublicInbox::MIME;
 use PublicInbox::Git;
@@ -32,14 +33,29 @@ my $PACKING_FACTOR = 0.4;
 # to increase Xapian shards
 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;
+       }
+
+       # should we bother with `sysctl hw.ncpu`?  Those only give
+       # us total processor count, not online processor count.
+       undef
+}
+
 sub nproc_shards ($) {
        my ($creat_opt) = @_;
        my $n = $creat_opt->{nproc} if ref($creat_opt) eq 'HASH';
        $n //= $ENV{NPROC};
        if (!$n) {
-               chomp($n = `nproc 2>/dev/null`);
-               # assume 2 cores if GNU nproc(1) is not available
-               $n = 2 if !$n;
+               # assume 2 cores if not detectable or zero
+               state $NPROC_DETECTED = detect_nproc() || 2;
+               $n = $NPROC_DETECTED;
                $n = $NPROC_MAX_DEFAULT if $n > $NPROC_MAX_DEFAULT;
        }
 
@@ -107,8 +123,11 @@ sub new {
 
 # public (for now?)
 sub init_inbox {
-       my ($self, $parallel, $skip_epoch) = @_;
-       $self->{parallel} = $parallel;
+       my ($self, $shards, $skip_epoch) = @_;
+       if (defined $shards) {
+               $self->{parallel} = 0 if $shards == 0;
+               $self->{shards} = $shards if $shards > 0;
+       }
        $self->idx_init;
        my $epoch_max = -1;
        git_dir_latest($self, \$epoch_max);