From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-3.8 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 6D50A1FEAA for ; Sat, 25 Jun 2016 00:45:35 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/4] http: always yield on getline/body Date: Sat, 25 Jun 2016 00:45:30 +0000 Message-Id: <20160625004533.5061-2-e@80x24.org> In-Reply-To: <20160625004533.5061-1-e@80x24.org> References: <20160625004533.5061-1-e@80x24.org> List-Id: We want to maximize fairness for large responses which may download the entire mbox. --- lib/PublicInbox/HTTP.pm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm index 800b240..c141fc8 100644 --- a/lib/PublicInbox/HTTP.pm +++ b/lib/PublicInbox/HTTP.pm @@ -16,7 +16,6 @@ use Fcntl qw(:seek); use Plack::HTTPParser qw(parse_http_request); # XS or pure Perl use HTTP::Status qw(status_message); use HTTP::Date qw(time2str); -use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC); use Scalar::Util qw(weaken); use IO::File; use constant { @@ -26,8 +25,6 @@ use constant { CHUNK_MAX_HDR => 256, }; -sub now () { clock_gettime(CLOCK_MONOTONIC) } - # FIXME: duplicated code with NNTP.pm, layering violation my $WEAKEN = {}; # string(inbox) -> inbox my $weakt; @@ -270,17 +267,15 @@ sub getline_response { my $forward = $self->{forward}; # limit our own running time for fairness with other # clients and to avoid buffering too much: - my $end = now() + 0.1; while ($forward && defined(my $buf = $forward->getline)) { $write->($buf); last if $self->{closed}; if ($self->{write_buf_size}) { $self->write($self->{pull}); - return; - } elsif (now() > $end) { + } else { PublicInbox::EvCleanup::asap($self->{pull}); - return; } + return; } $self->{forward} = $self->{pull} = undef; $forward->close if $forward; # avoid recursion