run update-copyrights from gnulib for 2019

[public-inbox.git] / lib / PublicInbox / HTTPD / Async.pm

diff --git a/lib/PublicInbox/HTTPD/Async.pm b/lib/PublicInbox/HTTPD/Async.pm
index 261a01e0fa477f0cd1b200c137c3c6ab25286fe8..8e8ece395de065d698b4df19d152cc10d96b93df 100644 (file)
--- a/lib/PublicInbox/HTTPD/Async.pm
+++ b/lib/PublicInbox/HTTPD/Async.pm
@@ -1,16 +1,18 @@
-# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # 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(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) = @_;
@@ -18,50 +20,40 @@ sub new {
        # no $io? call $cb at the top of the next event loop to
        # avoid recursion:
        unless (defined($io)) {
-               PublicInbox::EvCleanup::asap($cb) if $cb;
-               PublicInbox::EvCleanup::next_tick($cleanup) if $cleanup;
+               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;
 }
 
-# fires after pending writes are complete:
-sub restart_read_cb ($) {
-       my ($self) = @_;
-       sub { $self->watch_read(1) }
-}
-
-sub main_cb ($$$) {
-       my ($http, $fh, $bref) = @_;
+sub main_cb ($$) {
+       my ($http, $fh) = @_;
        sub {
                my ($self) = @_;
-               my $r = sysread($self->{sock}, $$bref, 8192);
+               my $r = sysread($self->{sock}, my $buf, 65536);
                if ($r) {
-                       $fh->write($$bref);
+                       $fh->write($buf); # may call $http->close
                        if ($http->{sock}) { # !closed
-                               if (scalar @{$http->{wbuf}}) {
-                                       $self->watch_read(0);
-                                       $http->write(restart_read_cb($self));
-                               }
-                               # stay in watch_read, but let other clients
-                               # get some work done, too.
+                               $self->requeue;
+                               # let other clients get some work done, too
                                return;
                        }
-                       # fall through to close below...
-               } 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
-               $http->{forward} = undef;
+               delete $http->{forward};
                $self->close;
        }
 }
@@ -72,19 +64,26 @@ sub async_pass {
        # will automatically close this ($self) object.
        $http->{forward} = $self;
        $fh->write($$bref); # PublicInbox:HTTP::{chunked,identity}_wcb
-       $self->{cb} = main_cb($http, $fh, $bref);
+       $$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 { $_[0]->{cb}->(@_) }
+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::next_tick($cleanup) if $cleanup;
+       if (my $cleanup = delete $self->{cleanup}) {
+               PublicInbox::DS::requeue($cleanup);
+       }
 }
 
 1;