-# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 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()
package PublicInbox::Gcf2Client;
use strict;
-use parent 'PublicInbox::Git';
-use PublicInbox::Spawn qw(popen_rd);
-use IO::Handle ();
-
-sub new {
+use parent qw(PublicInbox::DS);
+use PublicInbox::Git;
+use PublicInbox::Gcf2; # fails if Inline::C or libgit2-dev isn't available
+use PublicInbox::Spawn qw(spawn);
+use Socket qw(AF_UNIX SOCK_STREAM);
+use PublicInbox::Syscall qw(EPOLLIN EPOLLET);
+use PublicInbox::DS qw(awaitpid);
+# fields:
+# sock => socket to Gcf2::loop
+# The rest of these fields are compatible with what PublicInbox::Git
+# uses code-sharing
+# pid => PID of Gcf2::loop process
+# pid.owner => process which spawned {pid}
+# in => same as {sock}, for compatibility with PublicInbox::Git
+# inflight => array (see PublicInbox::Git)
+# rbuf => scalarref, may be non-existent or empty
+sub new {
my ($rdr) = @_;
my $self = bless {}, __PACKAGE__;
- my ($out_r, $out_w);
- pipe($out_r, $out_w) or $self->fail("pipe failed: $!");
+ # ensure the child process has the same @INC we do:
+ my $env = { PERL5LIB => join(':', @INC) };
+ my ($s1, $s2);
+ socketpair($s1, $s2, AF_UNIX, SOCK_STREAM, 0) or die "socketpair $!";
$rdr //= {};
- $rdr->{0} = $out_r;
- @$self{qw(in pid)} = popen_rd(['public-inbox-gcf2'], undef, $rdr);
+ $rdr->{0} = $rdr->{1} = $s2;
+ my $cmd = [$^X, qw[-MPublicInbox::Gcf2 -e PublicInbox::Gcf2::loop]];
+ $self->{'pid.owner'} = $$;
+ awaitpid($self->{pid} = spawn($cmd, $env, $rdr), undef);
+ $s1->blocking(0);
$self->{inflight} = [];
- $self->{out} = $out_w;
- fcntl($out_w, 1031, 4096) if $^O eq 'linux'; # 1031: F_SETPIPE_SZ
- $out_w->autoflush(1);
- $self;
+ $self->{in} = $s1;
+ $self->SUPER::new($s1, EPOLLIN|EPOLLET);
+}
+
+sub fail {
+ my $self = shift;
+ $self->close; # PublicInbox::DS::close
+ PublicInbox::Git::fail($self, @_);
+}
+
+sub gcf2_async ($$$;$) {
+ my ($self, $req, $cb, $arg) = @_;
+ my $inflight = $self->{inflight} or return $self->close;
+
+ # {wbuf} is rare, I hope:
+ cat_async_step($self, $inflight) if $self->{wbuf};
+
+ $self->fail("gcf2c write: $!") if !$self->write($req) && !$self->{sock};
+ push @$inflight, $req, $cb, $arg;
}
-sub add_git_dir {
- my ($self, $git_dir) = @_;
+# ensure PublicInbox::Git::cat_async_step never calls cat_async_retry
+sub alternates_changed {}
- # ensure buffers are drained, length($git_dir) may exceed
- # PIPE_BUF on platforms where PIPE_BUF is only 512 bytes
+# DS::event_loop will call this
+sub event_step {
+ my ($self) = @_;
+ $self->flush_write;
+ $self->close if !$self->{in} || !$self->{sock}; # process died
my $inflight = $self->{inflight};
- while (scalar(@$inflight)) {
- $self->cat_async_step($inflight);
+ if ($inflight && @$inflight) {
+ cat_async_step($self, $inflight);
+ return $self->close unless $self->{in}; # process died
+
+ # ok, more to do, requeue for fairness
+ $self->requeue if @$inflight || exists($self->{rbuf});
}
- print { $self->{out} } $git_dir, "\n" or
- $self->fail("write error: $!");
}
-# always false, since -gcf2 retries internally
-sub alternates_changed {}
+sub DESTROY {
+ my ($self) = @_;
+ delete $self->{sock}; # if outside event_loop
+ PublicInbox::Git::DESTROY($self);
+}
+
+no warnings 'once';
+
+*cat_async_step = \&PublicInbox::Git::cat_async_step;
1;