config: support "inboxdir" in addition to "mainrepo"

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

diff --git a/lib/PublicInbox/SpawnPP.pm b/lib/PublicInbox/SpawnPP.pm
index 36223e8132eefa30c380bf1b07fef42bbf40628b..29b1337103f59c164a6bd1c2fe79ea2d125cc743 100644 (file)
--- a/lib/PublicInbox/SpawnPP.pm
+++ b/lib/PublicInbox/SpawnPP.pm
@@ -1,19 +1,32 @@
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+
+# Pure-Perl implementation of "spawn".  This can't take advantage
+# of vfork, so no speedups under Linux for spawning from large processes.
 package PublicInbox::SpawnPP;
 use strict;
 use warnings;
 use POSIX qw(dup2 :signal_h);
 
 # Pure Perl implementation for folks that do not use Inline::C
-sub public_inbox_fork_exec ($$$$$$) {
-       my ($in, $out, $err, $f, $cmd, $env) = @_;
+sub pi_fork_exec ($$$$$$) {
+       my ($in, $out, $err, $f, $cmd, $env, $rlim) = @_;
        my $old = POSIX::SigSet->new();
        my $set = POSIX::SigSet->new();
        $set->fillset or die "fillset failed: $!";
        sigprocmask(SIG_SETMASK, $set, $old) or die "can't block signals: $!";
+       my $syserr;
        my $pid = fork;
+       unless (defined $pid) { # compat with Inline::C version
+               $syserr = $!;
+               $pid = -1;
+       }
        if ($pid == 0) {
+               while (@$rlim) {
+                       my ($r, $soft, $hard) = splice(@$rlim, 0, 3);
+                       BSD::Resource::setrlimit($r, $soft, $hard) or
+                         warn "failed to set $r=[$soft,$hard]\n";
+               }
                if ($in != 0) {
                        dup2($in, 0) or die "dup2 failed for stdin: $!";
                }
@@ -25,15 +38,18 @@ sub public_inbox_fork_exec ($$$$$$) {
                }
 
                if ($ENV{MOD_PERL}) {
-                       exec qw(env -i), @$env, @$cmd;
+                       exec which('env'), '-i', @$env, @$cmd;
                        die "exec env -i ... $cmd->[0] failed: $!\n";
                } else {
                        local %ENV = map { split(/=/, $_, 2) } @$env;
-                       exec @$cmd;
+                       my @cmd = @$cmd;
+                       $cmd[0] = $f;
+                       exec @cmd;
                        die "exec $cmd->[0] failed: $!\n";
                }
        }
        sigprocmask(SIG_SETMASK, $old) or die "can't unblock signals: $!";
+       $! = $syserr;
        $pid;
 }