From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id C0E061FA10 for ; Sat, 16 Oct 2021 01:01:03 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 04/12] httpd: move pipeline logic into event_step Date: Sat, 16 Oct 2021 01:00:55 +0000 Message-Id: <20211016010103.30825-5-e@80x24.org> In-Reply-To: <20211016010103.30825-1-e@80x24.org> References: <20211016010103.30825-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Most of the HTTP server code was written for Danga::Socket and not fully-transitioned to take advantage of PublicInbox::DS. This change brings it up-to-date with the style of pipeline handling used for -imapd and -nntpd. --- lib/PublicInbox/HTTP.pm | 59 +++++++++++------------------------------ 1 file changed, 15 insertions(+), 44 deletions(-) diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm index 8057481d1ce5..0f4b5047784a 100644 --- a/lib/PublicInbox/HTTP.pm +++ b/lib/PublicInbox/HTTP.pm @@ -37,16 +37,6 @@ use constant { }; use Errno qw(EAGAIN); -my $pipelineq = []; -sub process_pipelineq () { - my $q = $pipelineq; - $pipelineq = []; - foreach (@$q) { - next unless $_->{sock}; - rbuf_process($_); - } -} - # Use the same configuration parameter as git since this is primarily # a slow-client sponge for git-http-backend # TODO: support per-respository http.maxRequestBuffer somehow... @@ -86,32 +76,24 @@ sub event_step { # called by PublicInbox::DS # otherwise we can be buffering infinitely w/o backpressure return read_input($self) if ref($self->{env}); - my $rbuf = $self->{rbuf} // (\(my $x = '')); - $self->do_read($rbuf, 8192, length($$rbuf)) or return; - rbuf_process($self, $rbuf); -} - -sub rbuf_process { - my ($self, $rbuf) = @_; - $rbuf //= $self->{rbuf} // (\(my $x = '')); + my $rbuf = $self->{rbuf} // (\(my $x = '')); my %env = %{$self->{httpd}->{env}}; # full hash copy - my $r = parse_http_request($$rbuf, \%env); - - # We do not support Trailers in chunked requests, for now - # (they are rarely-used and git (as of 2.7.2) does not use them) - if ($r == -1 || $env{HTTP_TRAILER} || - # this length-check is necessary for PURE_PERL=1: - ($r == -2 && length($$rbuf) > 0x4000)) { - return quit($self, 400); - } - if ($r < 0) { # incomplete - $self->rbuf_idle($rbuf); - return $self->requeue; + my $r; + while (($r = parse_http_request($$rbuf, \%env)) < 0) { + # We do not support Trailers in chunked requests, for + # now (they are rarely-used and git (as of 2.7.2) does + # not use them). + # this length-check is necessary for PURE_PERL=1: + if ($r == -1 || $env{HTTP_TRAILER} || + ($r == -2 && length($$rbuf) > 0x4000)) { + return quit($self, 400); + } + $self->do_read($rbuf, 8192, length($$rbuf)) or return; } $$rbuf = substr($$rbuf, $r); - my $len = input_prepare($self, \%env); - defined $len or return write_err($self, undef); # EMFILE/ENFILE + my $len = input_prepare($self, \%env) // + return write_err($self, undef); # EMFILE/ENFILE $len ? read_input($self, $rbuf) : app_dispatch($self, undef, $rbuf); } @@ -238,22 +220,11 @@ sub identity_write ($$) { $self->write(\($_[1])) if $_[1] ne ''; } -sub next_request ($) { - my ($self) = @_; - if ($self->{rbuf}) { - # avoid recursion for pipelined requests - PublicInbox::DS::requeue(\&process_pipelineq) if !@$pipelineq; - push @$pipelineq, $self; - } else { # wait for next request - $self->requeue; - } -} - sub response_done { my ($self, $alive) = @_; delete $self->{env}; # we're no longer busy $self->write(\"0\r\n\r\n") if $alive == 2; - $self->write($alive ? \&next_request : \&close); + $self->write($alive ? $self->can('requeue') : \&close); } sub getline_pull {