#!perl -w
-# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
use strict;
use v5.10.1;
-use Cwd qw(cwd);
-use IO::Socket::UNIX;
+use Socket qw(AF_UNIX SOCK_STREAM pack_sockaddr_un);
+use PublicInbox::CmdIPC4;
+my $narg = 4;
+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;
+ PublicInbox::Spawn->can('send_cmd4');
+};
-if (eval { require IO::FDPass; 1 }) { # use daemon to reduce load time
+my ($sock, $pwd);
+if ($send_cmd && eval {
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-$<";
}
- unless (-d $runtime_dir && -w _) {
+ unless (-d $runtime_dir) {
require File::Path;
File::Path::mkpath($runtime_dir, 0, 0700);
}
- "$runtime_dir/sock";
+ "$runtime_dir/$narg.sock";
};
- my $sock = IO::Socket::UNIX->new(Peer => $path, Type => SOCK_STREAM);
- unless ($sock) { # start the daemon if not started
- my $err = $! + 0;
- my $env = { PERL5LIB => join(':', @INC) };
- my $cmd = [ $^X, qw[-MPublicInbox::LeiDaemon
- -E PublicInbox::LeiDaemon::lazy_start(@ARGV)],
- $path, $err ];
- require PublicInbox::Spawn;
- waitpid(PublicInbox::Spawn::spawn($cmd, $env), 0);
- warn "lei-daemon exited with \$?=$?\n" if $?;
+ my $addr = pack_sockaddr_un($path);
+ socket($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, $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
- $sock = IO::Socket::UNIX->new(Peer => $path,
- Type => SOCK_STREAM) // die
- "connect($path): $! (after attempted daemon start)";
+ connect($sock, $addr) or die <<"";
+connect($path): $! (after attempted daemon start)
+Falling back to (slow) one-shot mode
+
}
- my $pwd = $ENV{PWD};
- my $cwd = cwd();
- if ($pwd) { # prefer ENV{PWD} if it's a symlink to real cwd
- my @st_cwd = stat($cwd) or die "stat(cwd=$cwd): $!\n";
- my @st_pwd = stat($pwd);
+ 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;
- $sock->autoflush(1);
- IO::FDPass::send(fileno($sock), $_) for (0..2);
- my $buf = "$$\0\0>" . join("]\0[", @ARGV) . "\0\0>";
- while (my ($k, $v) = each %ENV) { $buf .= "$k=$v\0" }
+ my $buf = join("\0", $$, scalar(@ARGV), @ARGV);
+ while (my ($k, $v) = each %ENV) { $buf .= "\0$k=$v" }
$buf .= "\0\0";
- print $sock $buf or die "print(sock, buf): $!";
- local $/ = "\n";
- while (my $line = <$sock>) {
- $line =~ /\Aexit=([0-9]+)\n\z/ and exit($1 + 0);
- die $line;
+ 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;
}
-} else { # for systems lacking IO::FDPass
- require PublicInbox::LeiDaemon;
- PublicInbox::LeiDaemon::oneshot(__PACKAGE__);
+} else { # for systems lacking Socket::MsgHdr, IO::FDPass or Inline::C
+ warn $@ if $@;
+ require PublicInbox::LEI;
+ PublicInbox::LEI::oneshot(__PACKAGE__);
}