X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FHTTPD%2FAsync.pm;h=8e8ece395de065d698b4df19d152cc10d96b93df;hb=9bd675d33ad1e49bd2ebe12a1d216216e61380de;hp=47ba27d2e42979a2594aa23829ee0e02582be092;hpb=74bbc3da398d00ba12e9294e360ad177ab2061ed;p=public-inbox.git
diff --git a/lib/PublicInbox/HTTPD/Async.pm b/lib/PublicInbox/HTTPD/Async.pm
index 47ba27d2..8e8ece39 100644
--- a/lib/PublicInbox/HTTPD/Async.pm
+++ b/lib/PublicInbox/HTTPD/Async.pm
@@ -1,71 +1,89 @@
-# Copyright (C) 2016 all contributors
+# Copyright (C) 2016-2019 all contributors
# License: AGPL-3.0+
#
# XXX This is a totally unstable API for public-inbox internal use only
# This is exposed via the 'pi-httpd.async' key in the PSGI env hash.
# The name of this key is not even stable!
-# Currently is is intended for use with read-only pipes.
+# Currently intended for use with read-only pipes with expensive
+# processes such as git-http-backend(1), cgit(1)
package PublicInbox::HTTPD::Async;
use strict;
use warnings;
-use base qw(Danga::Socket);
+use base qw(PublicInbox::DS);
use fields qw(cb cleanup);
-require PublicInbox::EvCleanup;
+use Errno qw(EAGAIN);
+use PublicInbox::Syscall qw(EPOLLIN EPOLLET);
sub new {
my ($class, $io, $cb, $cleanup) = @_;
+
+ # no $io? call $cb at the top of the next event loop to
+ # avoid recursion:
+ unless (defined($io)) {
+ PublicInbox::DS::requeue($cb);
+ die 'cleanup unsupported w/o $io' if $cleanup;
+ return;
+ }
+
my $self = fields::new($class);
IO::Handle::blocking($io, 0);
- $self->SUPER::new($io);
+ $self->SUPER::new($io, EPOLLIN | EPOLLET);
$self->{cb} = $cb;
$self->{cleanup} = $cleanup;
- $self->watch_read(1);
$self;
}
-sub async_pass {
- my ($self, $io, $fh, $bref) = @_;
- my $restart_read = sub { $self->watch_read(1) };
- # In case the client HTTP connection ($io) dies, it
- # will automatically close this ($self) object.
- $io->{forward} = $self;
- $fh->write($$bref);
- $self->{cb} = sub {
- my $r = sysread($self->{sock}, $$bref, 8192);
+sub main_cb ($$) {
+ my ($http, $fh) = @_;
+ sub {
+ my ($self) = @_;
+ my $r = sysread($self->{sock}, my $buf, 65536);
if ($r) {
- $fh->write($$bref);
- if ($io->{write_buf_size}) {
- $self->watch_read(0);
- $io->write($restart_read); # D::S::write
+ $fh->write($buf); # may call $http->close
+ if ($http->{sock}) { # !closed
+ $self->requeue;
+ # let other clients get some work done, too
+ return;
}
- return; # stay in watch_read
- } elsif (!defined $r) {
- return if $!{EAGAIN} || $!{EINTR};
+
+ # else: fall through to close below...
+ } elsif (!defined $r && $! == EAGAIN) {
+ return; # EPOLLET means we'll be notified
}
# Done! Error handling will happen in $fh->close
# called by the {cleanup} handler
- $io->{forward} = undef;
+ delete $http->{forward};
$self->close;
}
}
-sub event_read { $_[0]->{cb}->() }
-sub event_hup { $_[0]->{cb}->() }
-sub event_err { $_[0]->{cb}->() }
-sub sysread { shift->{sock}->sysread(@_) }
+sub async_pass {
+ my ($self, $http, $fh, $bref) = @_;
+ # In case the client HTTP connection ($http) dies, it
+ # will automatically close this ($self) object.
+ $http->{forward} = $self;
+ $fh->write($$bref); # PublicInbox:HTTP::{chunked,identity}_wcb
+ $$bref = undef; # we're done with this
+ my $cb = $self->{cb} = main_cb($http, $fh);
+ $cb->($self); # either hit EAGAIN or ->requeue to keep EPOLLET happy
+}
+
+sub event_step {
+ # {cb} may be undef after ->requeue due to $http->close happening
+ my $cb = $_[0]->{cb} or return;
+ $cb->(@_);
+}
sub close {
- my $self = shift;
- my $cleanup = $self->{cleanup};
- $self->{cleanup} = $self->{cb} = undef;
- $self->SUPER::close(@_);
+ my $self = $_[0];
+ delete $self->{cb};
+ $self->SUPER::close;
# we defer this to the next timer loop since close is deferred
- PublicInbox::EvCleanup::asap($cleanup) if $cleanup;
+ if (my $cleanup = delete $self->{cleanup}) {
+ PublicInbox::DS::requeue($cleanup);
+ }
}
-# do not let ourselves be closed during graceful termination
-sub busy () { $_[0]->{cb} }
-
1;