# 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::CmdIPC1; # 2nd choice
- $narg = 1;
- PublicInbox::CmdIPC1->can('send_cmd1');
-} // do {
require PublicInbox::Spawn; # takes ~50ms even if built *sigh*
- $narg = 4;
+ $recv_cmd = PublicInbox::Spawn->can('recv_cmd4');
PublicInbox::Spawn->can('send_cmd4');
};
-my ($sock, $pwd);
+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;
+ }
+ if (@non_std) {
+ require Fcntl;
+ fcntl($_, Fcntl::F_SETFD(), 0) for @non_std;
+ }
+ my %env = map { split(/=/, $_, 2) } splice(@argv, $argc);
+ @ENV{keys %env} = values %env;
+ exec(@argv);
+ warn "exec: @argv: $!\n";
+ POSIX::_exit(1);
+ };
+ $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
+ }
+};
+
if ($send_cmd && eval {
my $path = do {
my $runtime_dir = ($ENV{XDG_RUNTIME_DIR} // '') . '/lei';
+ die \0 if $runtime_dir eq '/dev/null/lei'; # oneshot forced
if ($runtime_dir eq '/lei') {
require File::Spec;
$runtime_dir = File::Spec->tmpdir."/lei-$<";
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
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|IO::FDPass|Inline::C), $sock, $pwd are all available:
- local $ENV{PWD} = $pwd;
- my $buf = join("\0", $$, scalar(@ARGV), @ARGV);
+ # (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 ($buf = <$sock>) {
- $buf =~ /\Aexit=([0-9]+)\n\z/ and exit($1 + 0);
- die $buf;
+ my $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 =~ /\Aexec (.+)\z/) {
+ $exec_cmd->(\@fds, split(/\0/, $1));
+ } elsif ($buf eq '-WINCH') {
+ kill($buf, @parent); # for MUA
+ } 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;
+ } else {
+ $sigchld->();
+ die $buf;
+ }
+ }
+ $sigchld->();
+ if (my $sig = ($x_it_code & 127)) {
+ kill $sig, $$;
+ sleep(1) while 1;
}
-} else { # for systems lacking Socket::MsgHdr, IO::FDPass or Inline::C
- warn $@ if $@;
+ exit($x_it_code >> 8);
+} else { # for systems lacking Socket::MsgHdr or Inline::C
+ warn $@ if $@ && !ref($@);
require PublicInbox::LEI;
PublicInbox::LEI::oneshot(__PACKAGE__);
}