lei: avoid ETOOMANYREFS, cleanup imports

[public-inbox.git] / script / lei

diff --git a/script/lei b/script/lei
index 5c32ab88d07ff7ce39d3b5b5cba7f59467d09e34..58f0dbe92f90b36d243cfd46e1dc21a9aa31e96f 100755 (executable)
--- a/script/lei
+++ b/script/lei
@@ -3,32 +3,45 @@
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use v5.10.1;
-use Socket qw(AF_UNIX SOCK_STREAM pack_sockaddr_un);
+use Socket qw(AF_UNIX SOCK_SEQPACKET MSG_EOR pack_sockaddr_un);
 use PublicInbox::CmdIPC4;
-my $narg = 4;
+my $narg = 5;
+my $sock;
 my $recv_cmd = PublicInbox::CmdIPC4->can('recv_cmd4');
 my $send_cmd = PublicInbox::CmdIPC4->can('send_cmd4') // do {
        require PublicInbox::Spawn; # takes ~50ms even if built *sigh*
-       $narg = 4;
        $recv_cmd = PublicInbox::Spawn->can('recv_cmd4');
        PublicInbox::Spawn->can('send_cmd4');
 };
 
+sub sigchld {
+       my ($sig) = @_;
+       my $flags = $sig ? POSIX::WNOHANG() : 0;
+       while (waitpid(-1, $flags) > 0) {}
+}
+
 sub exec_cmd {
        my ($fds, $argc, @argv) = @_;
-       my %env = map { split(/=/, $_, 2) } splice(@argv, $argc);
-       my @m = (*STDIN{IO}, '<&=',  *STDOUT{IO}, '>&=',
-               *STDERR{IO}, '>&=');
+       my @old = (*STDIN{IO}, *STDOUT{IO}, *STDERR{IO});
+       my @rdr;
        for my $fd (@$fds) {
-               my ($old_io, $mode) = splice(@m, 0, 2);
-               open($old_io, $mode, $fd) or die "open $mode$fd: $!";
+               open(my $tmpfh, '+<&=', $fd) or die "open +<&=$fd: $!";
+               push @rdr, shift(@old), $tmpfh;
+       }
+       require POSIX; # WNOHANG
+       $SIG{CHLD} = \&sigchld;
+       my $pid = fork // die "fork: $!";
+       if ($pid == 0) {
+               my %env = map { split(/=/, $_, 2) } splice(@argv, $argc);
+               while (my ($old_io, $tmpfh) = splice(@rdr, 0, 2)) {
+                       open $old_io, '+<&', $tmpfh or die "open +<&=: $!";
+               }
+               %ENV = (%ENV, %env);
+               exec(@argv);
+               die "exec: @argv: $!";
        }
-       %ENV = (%ENV, %env);
-       exec(@argv);
-       die "exec: @argv: $!";
 }
 
-my ($sock, $pwd);
 if ($send_cmd && eval {
        my $path = do {
                my $runtime_dir = ($ENV{XDG_RUNTIME_DIR} // '') . '/lei';
@@ -40,10 +53,10 @@ if ($send_cmd && eval {
                        require File::Path;
                        File::Path::mkpath($runtime_dir, 0, 0700);
                }
-               "$runtime_dir/$narg.sock";
+               "$runtime_dir/$narg.seq.sock";
        };
        my $addr = pack_sockaddr_un($path);
-       socket($sock, AF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
+       socket($sock, AF_UNIX, SOCK_SEQPACKET, 0) or die "socket: $!";
        unless (connect($sock, $addr)) { # start the daemon if not started
                local $ENV{PERL5LIB} = join(':', @INC);
                open(my $daemon, '-|', $^X, qw[-MPublicInbox::LEI
@@ -59,36 +72,53 @@ connect($path): $! (after attempted daemon start)
 Falling back to (slow) one-shot mode
 
        }
-       require Cwd;
-       $pwd = $ENV{PWD} // '';
-       my $cwd = Cwd::fastcwd() // die "fastcwd(PWD=$pwd): $!";
-       if ($pwd ne $cwd) { # prefer ENV{PWD} if it's a symlink to real cwd
-               my @st_cwd = stat($cwd) or die "stat(cwd=$cwd): $!";
-               my @st_pwd = stat($pwd); # PWD invalid, use cwd
-               # make sure st_dev/st_ino match for {PWD} to be valid
-               $pwd = $cwd if (!@st_pwd || $st_pwd[1] != $st_cwd[1] ||
-                                       $st_pwd[0] != $st_cwd[0]);
-       } else {
-               $pwd = $cwd;
-       }
-       1;
-}) { # (Socket::MsgHdr|Inline::C), $sock, $pwd are all available:
-       local $ENV{PWD} = $pwd;
+       # (Socket::MsgHdr|Inline::C), $sock are all available:
+       open my $dh, '<', '.' or die "open(.) $!";
        my $buf = join("\0", scalar(@ARGV), @ARGV);
        while (my ($k, $v) = each %ENV) { $buf .= "\0$k=$v" }
        $buf .= "\0\0";
-       select $sock;
-       $| = 1; # unbuffer selected $sock
-       $send_cmd->($sock, [ 0, 1, 2 ], $buf, 0);
-       while (my (@fds) = $recv_cmd->($sock, $buf, 4096 * 33)) {
-               if ($buf =~ /\Aexit=([0-9]+)\n\z/) {
-                       exit($1);
-               } elsif ($buf =~ /\Aexec (.+)\n\z/) {
+       my $n = $send_cmd->($sock, [0, 1, 2, fileno($dh)], $buf, MSG_EOR);
+       if (!$n && $!{ETOOMANYREFS} && eval { require BSD::Resource }) {
+               my $NOFILE = BSD::Resource::RLIMIT_NOFILE();
+               my ($s, $h) = BSD::Resource::getrlimit($NOFILE);
+               if ($s < $h && BSD::Resource::setrlimit($NOFILE, $h, $h)) {
+                       $n = $send_cmd->($sock, [0, 1, 2, fileno($dh)],
+                                       $buf, MSG_EOR);
+               }
+       }
+       if (!$n) {
+               die "sendmsg: $! (check RLIMIT_NOFILE)\n" if $!{ETOOMANYREFS};
+               die "sendmsg: $!\n";
+       }
+       1;
+}) { # connected and request sent to lei-daemon, wait for responses or EOF
+       my $x_it_code = 0;
+       while (1) {
+               my (@fds) = $recv_cmd->($sock, my $buf, 4096 * 33);
+               if (scalar(@fds) == 1 && !defined($fds[0])) {
+                       next if $!{EINTR};
+                       last if $!{ECONNRESET};
+                       die "recvmsg: $!";
+               }
+               last if $buf eq '';
+               if ($buf =~ /\Ax_it ([0-9]+)\z/) {
+                       $x_it_code = $1 + 0;
+                       last;
+               } elsif ($buf =~ /\Achild_error ([0-9]+)\z/) {
+                       $x_it_code = $1 + 0;
+               } elsif ($buf =~ /\Aexec (.+)\z/) {
                        exec_cmd(\@fds, split(/\0/, $1));
                } else {
+                       sigchld();
                        die $buf;
                }
        }
+       sigchld();
+       if (my $sig = ($x_it_code & 127)) {
+               kill $sig, $$;
+               sleep;
+       }
+       exit($x_it_code >> 8);
 } else { # for systems lacking Socket::MsgHdr or Inline::C
        warn $@ if $@;
        require PublicInbox::LEI;