X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FGcf2Client.pm;h=2022293d6b0a4684c6d72adf74e6413a426fc0bf;hb=af0b0fb7a454470a32c452119d0392e0dedb3fe1;hp=42ff1bf33d5ef2898f6c4400f72db9bfa5d7b2cd;hpb=d78f50649a5545d66a61b5465ca7f5ce4be398ea;p=public-inbox.git

diff --git a/lib/PublicInbox/Gcf2Client.pm b/lib/PublicInbox/Gcf2Client.pm
index 42ff1bf3..2022293d 100644
--- a/lib/PublicInbox/Gcf2Client.pm
+++ b/lib/PublicInbox/Gcf2Client.pm
@@ -1,4 +1,4 @@
-# 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>
 
 # connects public-inbox processes to PublicInbox::Gcf2::loop()
@@ -8,27 +8,31 @@ use parent qw(PublicInbox::DS);
 use PublicInbox::Git;
 use PublicInbox::Spawn qw(popen_rd);
 use IO::Handle ();
-use PublicInbox::Syscall qw(EPOLLONESHOT EPOLLOUT);
+use PublicInbox::Syscall qw(EPOLLONESHOT);
+use PublicInbox::DS qw(dwaitpid);
 # fields:
 #	async_cat => GitAsyncCat ref (read-only pipe)
 #	sock => writable pipe to Gcf2::loop
-
-sub new { bless($_[0] // {}, __PACKAGE__) }
-
-sub gcf2c_begin ($) {
-	my ($self) = @_;
+#	in => pipe we read from
+#	pid => PID of Gcf2::loop process
+#	owner_pid => process which spawned {pid}
+sub new  {
+	my ($rdr) = @_;
+	my $self = bless {}, __PACKAGE__;
 	# ensure the child process has the same @INC we do:
 	my $env = { PERL5LIB => join(':', @INC) };
 	my ($out_r, $out_w);
 	pipe($out_r, $out_w) or die "pipe failed: $!";
-	my $rdr = { 0 => $out_r, 2 => $self->{2} };
+	$rdr //= {};
+	$rdr->{0} = $out_r;
 	my $cmd = [$^X, qw[-MPublicInbox::Gcf2 -e PublicInbox::Gcf2::loop()]];
+	$self->{owner_pid} = $$;
 	@$self{qw(in pid)} = popen_rd($cmd, $env, $rdr);
 	fcntl($out_w, 1031, 4096) if $^O eq 'linux'; # 1031: F_SETPIPE_SZ
 	$out_w->autoflush(1);
 	$out_w->blocking(0);
-	$self->SUPER::new($out_w, 0); # EPOLL_CTL_ADD (a bit wasteful :x)
 	$self->{inflight} = [];
+	$self->SUPER::new($out_w, EPOLLONESHOT); # detect errors once
 }
 
 sub fail {
@@ -39,22 +43,39 @@ sub fail {
 
 sub cat_async ($$$;$) {
 	my ($self, $req, $cb, $arg) = @_;
-	my $inflight = $self->{inflight} // gcf2c_begin($self);
+	my $inflight = $self->{inflight};
 
-	# rare, I hope:
+	# {wbuf} is rare, I hope:
 	cat_async_step($self, $inflight) if $self->{wbuf};
 
-	$self->write(\"$req\n") or $self->fail("gcf2c write: $!");
+	if (!$self->write(\"$req\n")) {
+		$self->fail("gcf2c write: $!") if !$self->{sock};
+	}
 	push @$inflight, $req, $cb, $arg;
 }
 
 # ensure PublicInbox::Git::cat_async_step never calls cat_async_retry
 sub alternates_changed {}
 
+# this is the write-only end of a pipe, DS->EventLoop will call this
+sub event_step {
+	my ($self) = @_;
+	$self->flush_write;
+	$self->close if !$self->{in}; # process died
+}
+
 no warnings 'once';
 
-# this is the write-only end of a pipe, DS->EventLoop will call this
-*event_step = \&PublicInbox::DS::flush_write;
+sub DESTROY {
+	my ($self) = @_;
+	delete $self->{in};
+	# GitAsyncCat::event_step may reap us with WNOHANG, too
+	my $pid = delete $self->{pid} or return;
+	if ($$ == $self->{owner_pid}) {
+		PublicInbox::DS->in_loop ? $self->close : delete($self->{sock});
+		dwaitpid $pid;
+	}
+}
 
 # used by GitAsyncCat
 *cat_async_step = \&PublicInbox::Git::cat_async_step;