X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FHTTPD%2FAsync.pm;h=7bbab1e1cd65c22d2a895f5a99b5924fa172afd5;hb=a12cd80b5821cf5cb2c8672aad0fba94c451f728;hp=1de9501d18c43528e4ce634458b394d089d6eb41;hpb=da143a9393faa4956403b3f7a4c6ecb5ae3bcf01;p=public-inbox.git
diff --git a/lib/PublicInbox/HTTPD/Async.pm b/lib/PublicInbox/HTTPD/Async.pm
index 1de9501d..7bbab1e1 100644
--- a/lib/PublicInbox/HTTPD/Async.pm
+++ b/lib/PublicInbox/HTTPD/Async.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
#
# XXX This is a totally unstable API for public-inbox internal use only
@@ -14,10 +14,10 @@
# arg: arg for {cb}
# end_obj: CODE or object which responds to ->event_step when ->close is called
package PublicInbox::HTTPD::Async;
-use strict;
+use v5.12;
use parent qw(PublicInbox::DS);
use Errno qw(EAGAIN);
-use PublicInbox::Syscall qw(EPOLLIN EPOLLET);
+use PublicInbox::Syscall qw(EPOLLIN);
# This is called via: $env->{'pi-httpd.async'}->()
# $io is a read-only pipe ($rpipe) for now, but may be a
@@ -37,35 +37,33 @@ sub new {
arg => $arg, # arg for $cb
end_obj => $end_obj, # like END{}, can ->event_step
}, $class;
- my $pp = tied *$io;
+ my $pp = tied *$io; # ProcessPipe
$pp->{fh}->blocking(0) // die "$io->blocking(0): $!";
- $self->SUPER::new($io, EPOLLIN | EPOLLET);
+ $self->SUPER::new($io, EPOLLIN);
}
sub event_step {
my ($self) = @_;
- if (my $cb = delete $self->{cb}) {
+ if (defined $self->{cb}) {
# this may call async_pass when headers are done
- $cb->(delete $self->{arg});
+ $self->{cb}->($self->{arg});
} elsif (my $sock = $self->{sock}) {
- my $http = $self->{http};
+ # $http may be undef if discarding body output from cgit on 404
+ my $http = $self->{http} or return $self->close;
# $self->{sock} is a read pipe for git-http-backend or cgit
# and 65536 is the default Linux pipe size
my $r = sysread($sock, my $buf, 65536);
if ($r) {
- $self->{fh}->write($buf); # may call $http->close
- if ($http->{sock}) { # !closed
- $self->requeue;
- # let other clients get some work done, too
- return;
- }
+ $self->{ofh}->write($buf); # may call $http->close
+ # let other clients get some work done, too
+ return if $http->{sock}; # !closed
# else: fall through to close below...
} elsif (!defined $r && $! == EAGAIN) {
- return; # EPOLLET means we'll be notified
+ return; # EPOLLIN means we'll be notified
}
- # Done! Error handling will happen in $self->{fh}->close
+ # Done! Error handling will happen in $self->{ofh}->close
# called by end_obj->event_step handler
delete $http->{forward};
$self->close; # queues end_obj->event_step to be called
@@ -73,31 +71,31 @@ sub event_step {
}
# once this is called, all data we read is passed to the
-# to the PublicInbox::HTTP instance ($http) via $fh->write
+# to the PublicInbox::HTTP instance ($http) via $ofh->write
+# $ofh is typically PublicInbox::HTTP::{Chunked,Identity}, but
+# may be PublicInbox::GzipFilter or $PublicInbox::Qspawn::qx_fh
sub async_pass {
- my ($self, $http, $fh, $bref) = @_;
+ my ($self, $http, $ofh, $bref) = @_;
+ delete @$self{qw(cb arg)};
# In case the client HTTP connection ($http) dies, it
# will automatically close this ($self) object.
$http->{forward} = $self;
- # write anything we overread when we were reading headers
- $fh->write($$bref); # PublicInbox:HTTP::{chunked,identity}_wcb
-
- # we're done with this, free this memory up ASAP since the
- # calls after this may use much memory:
- $$bref = undef;
+ # write anything we overread when we were reading headers.
+ # This is typically PublicInbox:HTTP::{chunked,identity}_wcb,
+ # but may be PublicInbox::GzipFilter::write. PSGI requires
+ # *_wcb methods respond to ->write (and ->close), not ->print
+ $ofh->write($$bref);
$self->{http} = $http;
- $self->{fh} = $fh;
-
- # either hit EAGAIN or ->requeue to keep EPOLLET happy
- event_step($self);
+ $self->{ofh} = $ofh;
}
# may be called as $forward->close in PublicInbox::HTTP or EOF (event_step)
sub close {
my $self = $_[0];
$self->SUPER::close; # DS::close
+ delete @$self{qw(cb arg)};
# we defer this to the next timer loop since close is deferred
if (my $end_obj = delete $self->{end_obj}) {