X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSpawnPP.pm;h=73859e9b11ecf9882bf7045db0e31005ba5fdb8c;hb=9eb8baf199cd148b7ebf8e6e130fb832f4e1ef00;hp=288625d00a9279305bea4e7de7f69fe8f493fa14;hpb=89bd3f4826f91647216765534eacfb37267a27a3;p=public-inbox.git
diff --git a/lib/PublicInbox/SpawnPP.pm b/lib/PublicInbox/SpawnPP.pm
index 288625d0..73859e9b 100644
--- a/lib/PublicInbox/SpawnPP.pm
+++ b/lib/PublicInbox/SpawnPP.pm
@@ -1,31 +1,66 @@
-# Copyright (C) 2016 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
+
+# Pure-Perl implementation of "spawn". This can't take advantage
+# of vfork, so no speedups under Linux for spawning from large processes.
+# Do not require this directly, only use from PublicInbox::Spawn
package PublicInbox::SpawnPP;
-use strict;
-use warnings;
-use POSIX qw(dup2);
+use v5.12;
+use POSIX qw(dup2 _exit setpgid :signal_h);
+use PublicInbox::Spawn qw(which);
# Pure Perl implementation for folks that do not use Inline::C
-sub public_inbox_fork_exec ($$$$$$) {
- my ($in, $out, $err, $f, $cmd, $env) = @_;
- my $pid = fork;
+sub pi_fork_exec ($$$$$$$) {
+ my ($redir, $f, $cmd, $env, $rlim, $cd, $pgid) = @_;
+ my $old = POSIX::SigSet->new();
+ my $set = POSIX::SigSet->new();
+ $set->fillset or die "sigfillset: $!";
+ sigprocmask(SIG_SETMASK, $set, $old) or die "SIG_SETMASK(set): $!";
+ my $syserr;
+ pipe(my ($r, $w)) or die "pipe: $!";
+ my $pid = fork // die "fork (+exec) @$cmd: $!\n";
if ($pid == 0) {
- if ($in != 0) {
- dup2($in, 0) or die "dup2 failed for stdin: $!";
+ close $r;
+ $SIG{__DIE__} = sub {
+ warn(@_);
+ syswrite($w, my $num = $! + 0);
+ _exit(1);
+ };
+ for my $child_fd (0..$#$redir) {
+ my $parent_fd = $redir->[$child_fd];
+ next if $parent_fd == $child_fd;
+ dup2($parent_fd, $child_fd) or
+ die "dup2($parent_fd, $child_fd): $!";
+ }
+ if ($pgid >= 0 && !defined(setpgid(0, $pgid))) {
+ die "setpgid(0, $pgid): $!";
}
- if ($out != 1) {
- dup2($out, 1) or die "dup2 failed for stdout: $!";
+ $SIG{$_} = 'DEFAULT' for grep(!/\A__/, keys %SIG);
+ if ($cd ne '') {
+ chdir $cd or die "chdir $cd: $!";
}
- if ($err != 2) {
- dup2($err, 2) or die "dup2 failed for stderr: $!";
+ while (@$rlim) {
+ my ($r, $soft, $hard) = splice(@$rlim, 0, 3);
+ BSD::Resource::setrlimit($r, $soft, $hard) or
+ die "setrlimit($r=[$soft,$hard]: $!)";
}
- %ENV = ();
- foreach my $e (@$env) {
- my ($k, $v) = split('=', $e, 2);
- $ENV{$k} = $v;
+ $old->delset(POSIX::SIGCHLD) or die "sigdelset CHLD: $!";
+ sigprocmask(SIG_SETMASK, $old) or die "SIG_SETMASK ~CHLD: $!";
+ $cmd->[0] = $f;
+ if ($ENV{MOD_PERL}) {
+ $f = which('env');
+ @$cmd = ('env', '-i', @$env, @$cmd);
+ } else {
+ %ENV = map { split(/=/, $_, 2) } @$env;
}
- exec @$cmd;
- die "exec $cmd->[0] failed: $!\n";
+ exec { $f } @$cmd;
+ die "exec @$cmd failed: $!";
+ }
+ close $w;
+ sigprocmask(SIG_SETMASK, $old) or die "SIG_SETMASK(old): $!";
+ if (my $cerrnum = do { local $/, <$r> }) {
+ $! = $cerrnum;
+ die "forked child $@: $!";
}
$pid;
}