X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSpawn.pm;h=e0a51c2167e829549d20683470aa55b02c3556b5;hb=74f027ca317067f7ae7289b15465d6a49078f65c;hp=fe7aa0a8b5f6fce9a0326cced1efb2a41f84ce6b;hpb=e01fe4f05196b56775fffffe23572ec648b14ec6;p=public-inbox.git diff --git a/lib/PublicInbox/Spawn.pm b/lib/PublicInbox/Spawn.pm index fe7aa0a8..e0a51c21 100644 --- a/lib/PublicInbox/Spawn.pm +++ b/lib/PublicInbox/Spawn.pm @@ -18,11 +18,14 @@ package PublicInbox::Spawn; 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 #include #include @@ -31,6 +34,9 @@ my $all_libc = <<'ALL_LIBC'; # all *nix systems we support #include #include #include +#include +#include +#include /* some platforms need alloca.h, but some don't */ #if defined(__GNUC__) && !defined(alloca) @@ -159,6 +165,22 @@ int pi_fork_exec(SV *redirref, SV *file, SV *cmdref, SV *envref, SV *rlimref, return (int)pid; } +static int sleep_wait(unsigned *tries, int err) +{ + const struct timespec req = { 0, 100000000 }; /* 100ms */ + switch (err) { + case ENOBUFS: case ENOMEM: case ETOOMANYREFS: + if (++*tries < 50) { + fprintf(stderr, "sleeping on sendmsg: %s (#%u)\n", + strerror(err), *tries); + nanosleep(&req, NULL); + return 1; + } + default: + return 0; + } +} + #if defined(CMSG_SPACE) && defined(CMSG_LEN) #define SEND_FD_CAPA 10 #define SEND_FD_SPACE (SEND_FD_CAPA * sizeof(int)) @@ -177,6 +199,7 @@ SV *send_cmd4(PerlIO *s, SV *svfds, SV *data, int flags) AV *fds = (AV *)SvRV(svfds); I32 i, nfds = av_len(fds) + 1; int *fdp; + unsigned tries = 0; if (SvOK(data)) { iov.iov_base = SvPV(data, dlen); @@ -204,7 +227,9 @@ SV *send_cmd4(PerlIO *s, SV *svfds, SV *data, int flags) *fdp++ = SvIV(*fd); } } - sent = sendmsg(PerlIO_fileno(s), &msg, flags); + do { + sent = sendmsg(PerlIO_fileno(s), &msg, flags); + } while (sent < 0 && sleep_wait(&tries, errno)); return sent >= 0 ? newSViv(sent) : &PL_sv_undef; } @@ -249,15 +274,12 @@ ALL_LIBC # 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 #include #include #include #include -#include -#include -#include void nodatacow_fd(int fd) { @@ -296,52 +318,61 @@ void nodatacow_dir(const char *dir) } 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) = @_;