use File::Path qw(mkpath);
use File::Spec;
our $quit = \&CORE::exit;
-my $recv_3fds;
+my $recv_cmd;
my $GLP = Getopt::Long::Parser->new;
$GLP->configure(qw(gnu_getopt no_ignore_case auto_abbrev));
my $GLP_PASS = Getopt::Long::Parser->new;
undef;
}
+# usage: local %SIG = (%SIG, $lei->atfork_child_wq($wq));
+sub atfork_child_wq {
+ my ($self, $wq) = @_;
+ $self->{sock} //= $wq->{0};
+ $self->{$_} //= $wq->{$_} for (0..2);
+ my $oldpipe = $SIG{PIPE};
+ (
+ __WARN__ => sub { err($self, @_) },
+ PIPE => sub {
+ $self->x_it(141);
+ $oldpipe->() if ref($oldpipe) eq 'CODE';
+ }
+ );
+}
+
+# usage: ($lei, @io) = $lei->atfork_prepare_wq($wq);
+sub atfork_prepare_wq {
+ my ($self, $wq) = @_;
+ if ($wq->wq_workers) {
+ my $ret = bless { %$self }, ref($self);
+ my $in = delete $ret->{0};
+ ($ret, delete($ret->{sock}) // $in, delete @$ret{1, 2});
+ } else {
+ ($self, ($self->{sock} // $self->{0}), @$self{1, 2});
+ }
+}
+
sub _help ($;$) {
my ($self, $errmsg) = @_;
my $cmd = $self->{cmd} // 'COMMAND';
$env->{LV} //= '-c';
$env->{COLUMNS} //= 80; # TODO TIOCGWINSZ
$env->{MORE} //= 'FRX' if $^O eq 'freebsd';
- pipe(my ($r, $w)) or return warn "pipe: $!";
+ pipe(my ($r, $wpager)) or return warn "pipe: $!";
my $rdr = { 0 => $r, 1 => $self->{1}, 2 => $self->{2} };
- $self->{1} = $w;
- $self->{2} = $w if -t $self->{2};
- $self->{'pager.pid'} = spawn([$pager], $env, $rdr);
+ $self->{1} = $wpager;
+ $self->{2} = $wpager if -t $self->{2};
+ my $pid = spawn([$pager], $env, $rdr);
$env->{GIT_PAGER_IN_USE} = 'true'; # we may spawn git
+ [ $pid, @$rdr{1, 2} ];
}
sub accept_dispatch { # Listener {post_accept} callback
my $self = bless { sock => $sock }, __PACKAGE__;
vec(my $rin = '', fileno($sock), 1) = 1;
# `say $sock' triggers "die" in lei(1)
+ my $buf;
if (select(my $rout = $rin, undef, undef, 1)) {
- my @fds = $recv_3fds->(fileno($sock));
+ my @fds = $recv_cmd->($sock, $buf, 4096 * 33); # >MAX_ARG_STRLEN
if (scalar(@fds) == 3) {
my $i = 0;
for my $rdr (qw(<&= >&= >&=)) {
}
}
} else {
- say $sock "recv_3fds failed: $!";
+ say $sock "recv_cmd failed: $!";
return;
}
} else {
return;
}
$self->{2}->autoflush(1); # keep stdout buffered until x_it|DESTROY
- # $ARGV_STR = join("]\0[", @ARGV);
- # $ENV_STR = join('', map { "$_=$ENV{$_}\0" } keys %ENV);
- # $line = "$$\0\0>$ARGV_STR\0\0>$ENV_STR\0\0";
- my ($client_pid, $argv, $env) = do {
- local $/ = "\0\0\0"; # yes, 3 NULs at EOL, not 2
- chomp(my $line = <$sock>);
- split(/\0\0>/, $line, 3);
- };
- my %env = map { split(/=/, $_, 2) } split(/\0/, $env);
+ # $ENV_STR = join('', map { "\0$_=$ENV{$_}" } keys %ENV);
+ # $buf = "$$\0$argc\0".join("\0", @ARGV).$ENV_STR."\0\0";
+ if (substr($buf, -2, 2, '') ne "\0\0") { # s/\0\0\z//
+ say $sock "request command truncated";
+ return;
+ }
+ my ($client_pid, $argc, @argv) = split(/\0/, $buf, -1);
+ undef $buf;
+ my %env = map { split(/=/, $_, 2) } splice(@argv, $argc);
if (chdir($env{PWD})) {
local %ENV = %env;
$self->{env} = \%env;
- $self->{pid} = $client_pid;
- eval { dispatch($self, split(/\]\0\[/, $argv)) };
+ $self->{pid} = $client_pid + 0;
+ eval { dispatch($self, @argv) };
say $sock $@ if $@;
} else {
say $sock "chdir($env{PWD}): $!"; # implicit close
sub noop {}
+our $oldset; sub oldset { $oldset }
+
# lei(1) calls this when it can't connect
sub lazy_start {
my ($path, $errno, $nfd) = @_;
my @st = stat($path) or die "stat($path): $!";
my $dev_ino_expect = pack('dd', $st[0], $st[1]); # dev+ino
pipe(my ($eof_r, $eof_w)) or die "pipe: $!";
- my $oldset = PublicInbox::Sigfd::block_signals();
+ local $oldset = PublicInbox::DS::block_signals();
if ($nfd == 1) {
- require IO::FDPass;
- $recv_3fds = sub { map { IO::FDPass::recv($_[0]) } (0..2) };
- } elsif ($nfd == 3) {
- $recv_3fds = PublicInbox::Spawn->can('recv_3fds');
+ require PublicInbox::CmdIPC1;
+ $recv_cmd = PublicInbox::CmdIPC1->can('recv_cmd1');
+ } elsif ($nfd == 4) {
+ $recv_cmd = PublicInbox::Spawn->can('recv_cmd4') // do {
+ require PublicInbox::CmdIPC4;
+ PublicInbox::CmdIPC4->can('recv_cmd4');
+ };
}
- $recv_3fds or die
- "IO::FDPass missing or Inline::C not installed/configured\n";
+ $recv_cmd or die <<"";
+(Socket::MsgHdr || IO::FDPass || Inline::C) missing/unconfigured (nfd=$nfd);
+
require PublicInbox::Listener;
require PublicInbox::EOFpipe;
(-p STDOUT) or die "E: stdout must be a pipe\n";
};
my $sigfd = PublicInbox::Sigfd->new($sig, SFD_NONBLOCK);
local %SIG = (%SIG, %$sig) if !$sigfd;
+ local $SIG{PIPE} = 'IGNORE';
if ($sigfd) { # TODO: use inotify/kqueue to detect unlinked sockets
PublicInbox::DS->SetLoopTimeout(5000);
} else {
# wake up every second to accept signals if we don't
# have signalfd or IO::KQueue:
- PublicInbox::Sigfd::sig_setmask($oldset);
+ PublicInbox::DS::sig_setmask($oldset);
PublicInbox::DS->SetLoopTimeout(1000);
}
PublicInbox::DS->SetPostLoopCallback(sub {
local %PATH2CFG;
umask(077) // die("umask(077): $!");
dispatch((bless {
- 0 => *STDIN{IO},
- 1 => *STDOUT{IO},
- 2 => *STDERR{IO},
+ 0 => *STDIN{GLOB},
+ 1 => *STDOUT{GLOB},
+ 2 => *STDERR{GLOB},
env => \%ENV
}, __PACKAGE__), @ARGV);
}
sub DESTROY {
my ($self) = @_;
$self->{1}->autoflush(1);
- if (my $pid = delete $self->{'pager.pid'}) {
- dwaitpid($pid, undef, $self->{sock});
- }
}
1;