use strict;
use parent qw(Exporter);
use Symbol qw(gensym);
+use Fcntl qw(LOCK_EX SEEK_SET);
+use IO::Handle ();
use PublicInbox::ProcessPipe;
our @EXPORT_OK = qw(which spawn popen_rd run_die nodatacow_dir);
our @RLIMITS = qw(RLIMIT_CPU RLIMIT_CORE RLIMIT_DATA);
-my $all_libc = <<'ALL_LIBC'; # all *nix systems we support
+BEGIN {
+ my $all_libc = <<'ALL_LIBC'; # all *nix systems we support
#include <sys/resource.h>
#include <sys/socket.h>
#include <sys/types.h>
} while (0)
/* needs to be safe inside a vfork'ed process */
-static void exit_err(int *cerrnum)
+static void exit_err(const char *fn, volatile int *cerrnum)
{
*cerrnum = errno;
+ write(2, fn, strlen(fn));
_exit(1);
}
* Be sure to update PublicInbox::SpawnPP if this changes
*/
int pi_fork_exec(SV *redirref, SV *file, SV *cmdref, SV *envref, SV *rlimref,
- const char *cd)
+ const char *cd, int pgid)
{
AV *redir = (AV *)SvRV(redirref);
AV *cmd = (AV *)SvRV(cmdref);
pid_t pid;
char **argv, **envp;
sigset_t set, old;
- int ret, perrnum, cerrnum = 0;
+ int ret, perrnum;
+ volatile int cerrnum = 0; /* shared due to vfork */
int chld_is_member;
+ I32 max_fd = av_len(redir);
AV2C_COPY(argv, cmd);
AV2C_COPY(envp, env);
pid = vfork();
if (pid == 0) {
int sig;
- I32 i, child_fd, max = av_len(redir);
+ I32 i, child_fd, max_rlim;
- for (child_fd = 0; child_fd <= max; child_fd++) {
+ for (child_fd = 0; child_fd <= max_fd; child_fd++) {
SV **parent = av_fetch(redir, child_fd, 0);
int parent_fd = SvIV(*parent);
if (parent_fd == child_fd)
continue;
if (dup2(parent_fd, child_fd) < 0)
- exit_err(&cerrnum);
+ exit_err("dup2", &cerrnum);
}
+ if (pgid >= 0 && setpgid(0, pgid) < 0)
+ exit_err("setpgid", &cerrnum);
for (sig = 1; sig < NSIG; sig++)
signal(sig, SIG_DFL); /* ignore errors on signals */
if (*cd && chdir(cd) < 0)
- exit_err(&cerrnum);
+ exit_err("chdir", &cerrnum);
- max = av_len(rlim);
- for (i = 0; i < max; i += 3) {
+ max_rlim = av_len(rlim);
+ for (i = 0; i < max_rlim; i += 3) {
struct rlimit rl;
SV **res = av_fetch(rlim, i, 0);
SV **soft = av_fetch(rlim, i + 1, 0);
rl.rlim_cur = SvIV(*soft);
rl.rlim_max = SvIV(*hard);
if (setrlimit(SvIV(*res), &rl) < 0)
- exit_err(&cerrnum);
+ exit_err("setrlimit", &cerrnum);
}
(void)sigprocmask(SIG_SETMASK, &old, NULL);
execve(filename, argv, envp);
- exit_err(&cerrnum);
+ exit_err("execve", &cerrnum);
}
perrnum = errno;
if (chld_is_member > 0)
ret = sigprocmask(SIG_SETMASK, &old, NULL);
assert(ret == 0 && "BUG calling sigprocmask to restore");
if (cerrnum) {
+ int err_fd = STDERR_FILENO;
+ if (err_fd <= max_fd) {
+ SV **parent = av_fetch(redir, err_fd, 0);
+ err_fd = SvIV(*parent);
+ }
if (pid > 0)
waitpid(pid, NULL, 0);
pid = -1;
+ /* continue message started by exit_err in child */
+ dprintf(err_fd, ": %s\n", strerror(cerrnum));
errno = cerrnum;
} else if (perrnum) {
errno = perrnum;
# directories. Disabling COW disables checksumming, so we only do this
# for regeneratable files, and not canonical git storage (git doesn't
# checksum refs, only data under $GIT_DIR/objects).
-my $set_nodatacow = $^O eq 'linux' ? <<'SET_NODATACOW' : '';
+ my $set_nodatacow = $^O eq 'linux' ? <<'SET_NODATACOW' : '';
#include <sys/ioctl.h>
#include <sys/vfs.h>
#include <linux/magic.h>
}
SET_NODATACOW
-my $inline_dir = $ENV{PERL_INLINE_DIRECTORY} //= (
- $ENV{XDG_CACHE_HOME} //
- ( ($ENV{HOME} // '/nonexistent').'/.cache' )
- ).'/public-inbox/inline-c';
-
-$set_nodatacow = $all_libc = undef unless -d $inline_dir && -w _;
-if (defined $all_libc) {
- # Inline 0.64 or later has locking in multi-process env,
- # but we support 0.5 on Debian wheezy
- use Fcntl qw(:flock);
- eval {
+ my $inline_dir = $ENV{PERL_INLINE_DIRECTORY} //= (
+ $ENV{XDG_CACHE_HOME} //
+ ( ($ENV{HOME} // '/nonexistent').'/.cache' )
+ ).'/public-inbox/inline-c';
+ warn "$inline_dir exists, not writable\n" if -e $inline_dir && !-w _;
+ $set_nodatacow = $all_libc = undef unless -d _ && -w _;
+ if (defined $all_libc) {
my $f = "$inline_dir/.public-inbox.lock";
- open my $fh, '>', $f or die "failed to open $f: $!\n";
- flock($fh, LOCK_EX) or die "LOCK_EX failed on $f: $!\n";
- eval 'use Inline C => $all_libc.$set_nodatacow';
- # . ', BUILD_NOISY => 1';
+ open my $oldout, '>&', \*STDOUT or die "dup(1): $!";
+ open my $olderr, '>&', \*STDERR or die "dup(2): $!";
+ open my $fh, '+>', $f or die "open($f): $!";
+ open STDOUT, '>&', $fh or die "1>$f: $!";
+ open STDERR, '>&', $fh or die "2>$f: $!";
+ STDERR->autoflush(1);
+ STDOUT->autoflush(1);
+
+ # CentOS 7.x ships Inline 0.53, 0.64+ has built-in locking
+ flock($fh, LOCK_EX) or die "LOCK_EX($f): $!";
+ eval <<'EOM';
+use Inline C => $all_libc.$set_nodatacow, BUILD_NOISY => 1;
+EOM
my $err = $@;
- my $ndc_err;
+ my $ndc_err = '';
if ($err && $set_nodatacow) { # missing Linux kernel headers
- $ndc_err = $err;
+ $ndc_err = "with set_nodatacow: <\n$err\n>\n";
undef $set_nodatacow;
- eval 'use Inline C => $all_libc';
+ eval <<'EOM';
+use Inline C => $all_libc, BUILD_NOISY => 1;
+EOM
+ };
+ $err = $@;
+ open(STDERR, '>&', $olderr) or warn "restore stderr: $!";
+ open(STDOUT, '>&', $oldout) or warn "restore stdout: $!";
+ if ($err) {
+ seek($fh, 0, SEEK_SET);
+ my @msg = <$fh>;
+ warn "Inline::C build failed:\n",
+ $ndc_err, $err, "\n", @msg;
+ $set_nodatacow = $all_libc = undef;
+ } elsif ($ndc_err) {
+ warn "Inline::C build succeeded w/o set_nodatacow\n",
+ "error $ndc_err";
}
- flock($fh, LOCK_UN) or die "LOCK_UN failed on $f: $!\n";
- die $err if $err;
- warn $ndc_err if $ndc_err;
- };
- if ($@) {
- warn "Inline::C failed for vfork: $@\n";
- $set_nodatacow = $all_libc = undef;
}
-}
-
-unless ($all_libc) {
- require PublicInbox::SpawnPP;
- *pi_fork_exec = \&PublicInbox::SpawnPP::pi_fork_exec
-}
-unless ($set_nodatacow) {
- require PublicInbox::NDC_PP;
- no warnings 'once';
- *nodatacow_fd = \&PublicInbox::NDC_PP::nodatacow_fd;
- *nodatacow_dir = \&PublicInbox::NDC_PP::nodatacow_dir;
-}
-
-undef $set_nodatacow;
-undef $all_libc;
+ unless ($all_libc) {
+ require PublicInbox::SpawnPP;
+ *pi_fork_exec = \&PublicInbox::SpawnPP::pi_fork_exec
+ }
+ unless ($set_nodatacow) {
+ require PublicInbox::NDC_PP;
+ no warnings 'once';
+ *nodatacow_fd = \&PublicInbox::NDC_PP::nodatacow_fd;
+ *nodatacow_dir = \&PublicInbox::NDC_PP::nodatacow_dir;
+ }
+} # /BEGIN
sub which ($) {
my ($file) = @_;
my $f = which($cmd->[0]) // die "$cmd->[0]: command not found\n";
my @env;
$opts ||= {};
-
- my %env = $env ? (%ENV, %$env) : %ENV;
+ my %env = (%ENV, $env ? %$env : ());
while (my ($k, $v) = each %env) {
- push @env, "$k=$v";
+ push @env, "$k=$v" if defined($v);
}
my $redir = [];
for my $child_fd (0..2) {
push @$rlim, $r, @$v;
}
my $cd = $opts->{'-C'} // ''; # undef => NULL mapping doesn't work?
- my $pid = pi_fork_exec($redir, $f, $cmd, \@env, $rlim, $cd);
+ my $pgid = $opts->{pgid} // -1;
+ my $pid = pi_fork_exec($redir, $f, $cmd, \@env, $rlim, $cd, $pgid);
die "fork_exec @$cmd failed: $!\n" unless $pid > 0;
$pid;
}