lei: avoid ETOOMANYREFS, cleanup imports

[public-inbox.git] / script / lei

diff --git a/script/lei b/script/lei
index a4a0217bfa3237ca0f684a012bcbf98740abd7e1..58f0dbe92f90b36d243cfd46e1dc21a9aa31e96f 100755 (executable)
--- a/script/lei
+++ b/script/lei
@@ -4,10 +4,9 @@
 use strict;
 use v5.10.1;
 use Socket qw(AF_UNIX SOCK_SEQPACKET MSG_EOR pack_sockaddr_un);
-use Errno qw(EINTR ECONNRESET);
 use PublicInbox::CmdIPC4;
 my $narg = 5;
-my ($sock, $pwd);
+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*
@@ -23,20 +22,19 @@ sub sigchld {
 
 sub exec_cmd {
        my ($fds, $argc, @argv) = @_;
-       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(my $tmpfh, $mode, $fd) or die "open $mode$fd: $!";
-               push @rdr, $old_io, $mode, $tmpfh;
+               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, $mode, $tmpfh) = splice(@rdr, 0, 3)) {
-                       open $old_io, $mode, $tmpfh or die "open $mode: $!";
+               while (my ($old_io, $tmpfh) = splice(@rdr, 0, 2)) {
+                       open $old_io, '+<&', $tmpfh or die "open +<&=: $!";
                }
                %ENV = (%ENV, %env);
                exec(@argv);
@@ -74,30 +72,40 @@ connect($path): $! (after attempted daemon start)
 Falling back to (slow) one-shot mode
 
        }
-       1;
-}) { # (Socket::MsgHdr|Inline::C), $sock, $pwd are all available:
+       # (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";
-       $send_cmd->($sock, [ 0, 1, 2, fileno($dh) ], $buf, MSG_EOR);
-       $SIG{TERM} = $SIG{INT} = $SIG{QUIT} = sub {
-               my ($sig) = @_; # 'TERM', not an integer :<
-               $SIG{$sig} = 'DEFAULT';
-               kill($sig, $$); # exit($signo + 128)
-       };
+       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, $buf, 4096 * 33);
+               my (@fds) = $recv_cmd->($sock, my $buf, 4096 * 33);
                if (scalar(@fds) == 1 && !defined($fds[0])) {
-                       last if $! == ECONNRESET;
-                       next if $! == EINTR;
+                       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 {