X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Flei;h=5feb77515d0f4a10c9fe8b67f859f8232f11e113;hb=9b0c238f887475d920a8589b492ec15c63770152;hp=2ea98da4d0ac4ec586d9ecb82bb7c69da89c3247;hpb=7c73a09c6df674e389fb20fb57f63c6bb9695d31;p=public-inbox.git
diff --git a/script/lei b/script/lei
index 2ea98da4..5feb7751 100755
--- a/script/lei
+++ b/script/lei
@@ -1,80 +1,147 @@
#!perl -w
-# Copyright (C) 2020-2021 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
-use strict;
-use v5.10.1;
-use Socket qw(AF_UNIX SOCK_STREAM pack_sockaddr_un);
-my ($send_3fds, $nfd);
-if (my ($sock, $pwd) = eval {
- $send_3fds = eval {
- require IO::FDPass;
- $nfd = 1; # 1 FD per-sendmsg
- sub { IO::FDPass::send($_[0], $_[$_]) for (1..3) }
- } // do {
- require PublicInbox::Spawn; # takes ~50ms even if built *sigh*
- $nfd = 3; # 3 FDs per-sendmsg(2)
- PublicInbox::Spawn->can('send_3fds');
- } // die "IO::FDPass missing or Inline::C not installed/configured\n";
- my $path = do {
- my $runtime_dir = ($ENV{XDG_RUNTIME_DIR} // '') . '/lei';
- if ($runtime_dir eq '/lei') {
- require File::Spec;
- $runtime_dir = File::Spec->tmpdir."/lei-$<";
+use v5.12;
+use Socket qw(AF_UNIX SOCK_SEQPACKET MSG_EOR pack_sockaddr_un);
+use PublicInbox::CmdIPC4;
+my $narg = 5;
+my $sock;
+my $recv_cmd = PublicInbox::CmdIPC4->can('recv_cmd4');
+my $send_cmd = PublicInbox::CmdIPC4->can('send_cmd4') // do {
+ require PublicInbox::Syscall;
+ $recv_cmd = PublicInbox::Syscall->can('recv_cmd4');
+ PublicInbox::Syscall->can('send_cmd4');
+} // do {
+ my $inline_dir = $ENV{PERL_INLINE_DIRECTORY} //= (
+ $ENV{XDG_CACHE_HOME} //
+ ( ($ENV{HOME} // '/nonexistent').'/.cache' )
+ ).'/public-inbox/inline-c';
+ if (!-d $inline_dir) {
+ require File::Path;
+ File::Path::make_path($inline_dir);
+ }
+ require PublicInbox::Spawn; # takes ~50ms even if built *sigh*
+ $recv_cmd = PublicInbox::Spawn->can('recv_cmd4');
+ PublicInbox::Spawn->can('send_cmd4');
+} // die 'please install Inline::C or Socket::MsgHdr';
+
+my %pids;
+my $sigchld = sub {
+ my $flags = scalar(@_) ? POSIX::WNOHANG() : 0;
+ for my $pid (keys %pids) {
+ delete($pids{$pid}) if waitpid($pid, $flags) == $pid;
+ }
+};
+my @parent;
+my $exec_cmd = sub {
+ my ($fds, $argc, @argv) = @_;
+ my $parent = $$;
+ require POSIX;
+ my @old = (*STDIN{IO}, *STDOUT{IO}, *STDERR{IO});
+ my @rdr;
+ for my $fd (@$fds) {
+ open(my $newfh, '+<&=', $fd) or die "open +<&=$fd: $!";
+ push @rdr, shift(@old), $newfh;
+ }
+ my $do_exec = sub {
+ my @non_std; # ex. $op_p from lei_edit_search
+ while (my ($io, $newfh) = splice(@rdr, 0, 2)) {
+ my $old_io = !!$io;
+ open $io, '+<&', $newfh or die "open +<&=: $!";
+ push @non_std, $io unless $old_io;
}
- unless (-d $runtime_dir) {
- require File::Path;
- File::Path::mkpath($runtime_dir, 0, 0700);
+ if (@non_std) {
+ require Fcntl;
+ fcntl($_, Fcntl::F_SETFD(), 0) for @non_std;
}
- "$runtime_dir/$nfd.sock";
+ my %env = map { split(/=/, $_, 2) } splice(@argv, $argc);
+ @ENV{keys %env} = values %env;
+ umask 077;
+ exec(@argv);
+ warn "exec: @argv: $!\n";
+ POSIX::_exit(1);
};
- my $addr = pack_sockaddr_un($path);
- socket(my $sock, AF_UNIX, SOCK_STREAM, 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
- -E PublicInbox::LEI::lazy_start(@ARGV)],
- $path, $! + 0, $nfd) or die "popen: $!";
- while (<$daemon>) { warn $_ } # EOF when STDERR is redirected
- close($daemon) or warn <<"";
+ $SIG{CHLD} = $sigchld;
+ my $pid = fork // die "fork: $!";
+ if ($pid == 0) {
+ $do_exec->() if $fds->[1]; # git-credential, pager
+
+ # parent backgrounds on MUA
+ POSIX::setsid() > 0 or die "setsid: $!";
+ @parent = ($parent);
+ return; # continue $recv_cmd in background
+ }
+ if ($fds->[1]) {
+ $pids{$pid} = undef;
+ } else {
+ $do_exec->(); # MUA reuses stdout
+ }
+};
+
+my $runtime_dir = ($ENV{XDG_RUNTIME_DIR} // '') . '/lei';
+if ($runtime_dir eq '/lei') {
+ require File::Spec;
+ $runtime_dir = File::Spec->tmpdir."/lei-$<";
+}
+unless (-d $runtime_dir) {
+ require File::Path;
+ File::Path::make_path($runtime_dir, { mode => 0700 });
+}
+my $path = "$runtime_dir/$narg.seq.sock";
+my $addr = pack_sockaddr_un($path);
+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
+ -E PublicInbox::LEI::lazy_start(@ARGV)],
+ $path, $! + 0, $narg) or die "popen: $!";
+ while (<$daemon>) { warn $_ } # EOF when STDERR is redirected
+ close($daemon) or warn <<"";
lei-daemon could not start, exited with \$?=$?
- # try connecting again anyways, unlink+bind may be racy
- unless (connect($sock, $addr)) {
- die <<"";
+ # try connecting again anyways, unlink+bind may be racy
+ connect($sock, $addr) or die <<"";
connect($path): $! (after attempted daemon start)
-Falling back to (slow) one-shot mode
- }
+}
+# (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) or die "sendmsg: $!";
+$SIG{TSTP} = sub { send($sock, 'STOP', MSG_EOR); kill 'STOP', $$ };
+$SIG{CONT} = sub { send($sock, 'CONT', MSG_EOR) };
+
+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};
+ die "recvmsg: $!";
}
- require Cwd;
- my $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]);
+ last if $buf eq '';
+ if ($buf =~ /\Aexec (.+)\z/) {
+ $exec_cmd->(\@fds, split(/\0/, $1));
+ } elsif ($buf eq '-WINCH') {
+ kill($buf, @parent); # for MUA
+ } elsif ($buf eq 'umask') {
+ send($sock, 'u'.pack('V', umask), MSG_EOR) or die "send: $!"
+ } elsif ($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 eq 'wait') {
+ $sigchld->();
} else {
- $pwd = $cwd;
- }
- ($sock, $pwd);
-}) { # IO::FDPass, $sock, $pwd are all available:
- local $ENV{PWD} = $pwd;
- my $buf = "$$\0\0>" . join("]\0[", @ARGV) . "\0\0>";
- while (my ($k, $v) = each %ENV) { $buf .= "$k=$v\0" }
- $buf .= "\0\0";
- select $sock;
- $| = 1; # unbuffer selected $sock
- $send_3fds->(fileno($sock), 0, 1, 2);
- print $sock $buf or die "print(sock, buf): $!";
- while ($buf = <$sock>) {
- $buf =~ /\Aexit=([0-9]+)\n\z/ and exit($1 + 0);
+ $sigchld->();
die $buf;
}
-} else { # for systems lacking IO::FDPass
- # don't warn about IO::FDPass since it's not commonly installed
- warn $@ if $@ && index($@, 'IO::FDPass') < 0;
- require PublicInbox::LEI;
- PublicInbox::LEI::oneshot(__PACKAGE__);
}
+$sigchld->();
+if (my $sig = ($x_it_code & 127)) {
+ kill $sig, $$;
+ sleep(1) while 1; # no self-pipe/signalfd, here, so we loop
+}
+exit($x_it_code >> 8);