3 files changed, 44 insertions, 4 deletions

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index ec9a469c..6f62712f 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -133,7 +133,9 @@ sub limiter {
         $self->{-limiters}->{$name} ||= do {
                 require PublicInbox::Qspawn;
                 my $max = $self->{"publicinboxlimiter.$name.max"};
-                PublicInbox::Qspawn::Limiter->new($max);
+                my $limiter = PublicInbox::Qspawn::Limiter->new($max);
+                $limiter->setup_rlimit($name, $self);
+                $limiter;
         };
 }
 
diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm
index 509a4412..79cdae71 100644
--- a/lib/PublicInbox/Qspawn.pm
+++ b/lib/PublicInbox/Qspawn.pm
@@ -43,10 +43,18 @@ sub new ($$$;) {
 sub _do_spawn {
         my ($self, $cb) = @_;
         my $err;
+        my ($cmd, $env, $opts) = @{$self->{args}};
+        my %opts = %{$opts || {}};
+        my $limiter = $self->{limiter};
+        foreach my $k (PublicInbox::Spawn::RLIMITS()) {
+                if (defined(my $rlimit = $limiter->{$k})) {
+                        $opts{$k} = $rlimit;
+                }
+        }
 
-        ($self->{rpipe}, $self->{pid}) = popen_rd(@{$self->{args}});
+        ($self->{rpipe}, $self->{pid}) = popen_rd($cmd, $env, \%opts);
         if (defined $self->{pid}) {
-                $self->{limiter}->{running}++;
+                $limiter->{running}++;
         } else {
                 $self->{err} = $!;
         }
@@ -251,9 +259,38 @@ sub new {
                 max => $max || 32,
                 running => 0,
                 run_queue => [],
+                # RLIMIT_CPU => undef,
+                # RLIMIT_DATA => undef,
+                # RLIMIT_CORE => undef,
         }, $class;
 }
 
+sub setup_rlimit {
+        my ($self, $name, $config) = @_;
+        foreach my $rlim (PublicInbox::Spawn::RLIMITS()) {
+                my $k = lc($rlim);
+                $k =~ tr/_//d;
+                $k = "publicinboxlimiter.$name.$k";
+                defined(my $v = $config->{$k}) or next;
+                my @rlimit = split(/\s*,\s*/, $v);
+                if (scalar(@rlimit) == 1) {
+                        push @rlimit, $rlimit[0];
+                } elsif (scalar(@rlimit) != 2) {
+                        warn "could not parse $k: $v\n";
+                }
+                eval { require BSD::Resource };
+                if ($@) {
+                        warn "BSD::Resource missing for $rlim";
+                        next;
+                }
+                foreach my $i (0..$#rlimit) {
+                        next if $rlimit[$i] ne 'INFINITY';
+                        $rlimit[$i] = BSD::Resource::RLIM_INFINITY();
+                }
+                $self->{$rlim} = \@rlimit;
+        }
+}
+
 # captures everything into a buffer and executes a callback when done
 package PublicInbox::Qspawn::Qx;
 use strict;
diff --git a/lib/PublicInbox/Spawn.pm b/lib/PublicInbox/Spawn.pm
index 202cfcae..fd981608 100644
--- a/lib/PublicInbox/Spawn.pm
+++ b/lib/PublicInbox/Spawn.pm
@@ -18,6 +18,7 @@ use Symbol qw(gensym);
 use IO::Handle;
 use PublicInbox::ProcessPipe;
 our @EXPORT_OK = qw/which spawn popen_rd/;
+sub RLIMITS () { qw(RLIMIT_CPU RLIMIT_CORE RLIMIT_DATA) }
 
 my $vfork_spawn = <<'VFORK_SPAWN';
 #include <sys/types.h>
@@ -202,7 +203,7 @@ sub spawn ($;$$) {
         my $err = $opts->{2} || 2;
         my $rlim = [];
 
-        foreach my $l (qw(RLIMIT_CPU RLIMIT_CORE RLIMIT_DATA)) {
+        foreach my $l (RLIMITS()) {
                 defined(my $v = $opts->{$l}) or next;
                 my ($soft, $hard);
                 if (ref($v)) {