From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 03/11] wwwstream: introduce oneshot API to avoid ->getline
Date: Sat, 21 Mar 2020 02:03:46 +0000 [thread overview]
Message-ID: <20200321020354.9056-4-e@yhbt.net> (raw)
In-Reply-To: <20200321020354.9056-1-e@yhbt.net>
The ->getline API is only useful for limiting memory use when
streaming responses containing multiple emails or log messages.
However it's unnecessary complexity and overhead for callers
(PublicInbox::HTTP) when there's only a single message.
---
lib/PublicInbox/ViewVCS.pm | 8 +-------
lib/PublicInbox/WwwStream.pm | 21 ++++++++++++++++++---
2 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index 2f8e1c4f..6714e67c 100644
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -31,17 +31,11 @@ my %QP_MAP = ( A => 'oid_a', B => 'oid_b', a => 'path_a', b => 'path_b' );
our $MAX_SIZE = 1024 * 1024; # TODO: configurable
my $BIN_DETECT = 8000; # same as git
-sub html_i { # WwwStream::getline callback
- my ($nr, $ctx) = @_;
- $nr == 1 ? ${delete $ctx->{obuf}} : undef;
-}
-
sub html_page ($$$) {
my ($ctx, $code, $strref) = @_;
my $wcb = delete $ctx->{-wcb};
$ctx->{-upfx} = '../../'; # from "/$INBOX/$OID/s/"
- $ctx->{obuf} = $strref;
- my $res = PublicInbox::WwwStream->response($ctx, $code, \&html_i);
+ my $res = PublicInbox::WwwStream::oneshot($ctx, $code, $strref);
$wcb ? $wcb->($res) : $res;
}
diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index 3a867ec3..2dd8b157 100644
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -16,16 +16,21 @@ our $CODE_URL = 'https://public-inbox.org/public-inbox.git';
# noop for HTTP.pm (and any other PSGI servers)
sub close {}
+sub base_url ($) {
+ my $ctx = shift;
+ my $base_url = $ctx->{-inbox}->base_url($ctx->{env});
+ chop $base_url; # no trailing slash for clone
+ $base_url;
+}
+
sub new {
my ($class, $ctx, $cb) = @_;
- my $base_url = $ctx->{-inbox}->base_url($ctx->{env});
- chop $base_url; # no trailing slash for clone
bless {
nr => 0,
cb => $cb || \&close,
ctx => $ctx,
- base_url => $base_url,
+ base_url => base_url($ctx),
}, $class;
}
@@ -164,4 +169,14 @@ sub getline {
delete $self->{cb} ? _html_end($self) : undef;
}
+sub oneshot {
+ my ($ctx, $code, $strref) = @_;
+ my $self = bless {
+ ctx => $ctx,
+ base_url => base_url($ctx),
+ }, __PACKAGE__;
+ [ $code, [ 'Content-Type', 'text/html; charset=UTF-8' ],
+ [ _html_top($self), $$strref, _html_end($self) ] ]
+}
+
1;
next prev parent reply other threads:[~2020-03-21 2:03 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-21 2:03 [PATCH 00/11] www: export SQLite altid dumps Eric Wong
2020-03-21 2:03 ` [PATCH 01/11] qspawn: reinstate filter support, add gzip filter Eric Wong
2020-03-21 2:03 ` [PATCH 02/11] gzipfilter: lazy allocate the deflate context Eric Wong
2020-03-21 2:03 ` Eric Wong [this message]
2020-03-21 2:03 ` [PATCH 04/11] extmsg: use WwwResponse::oneshot Eric Wong
2020-03-21 2:03 ` [PATCH 05/11] wwwstream: oneshot sets content-length Eric Wong
2020-03-21 2:03 ` [PATCH 06/11] mbox: need_gzip uses WwwStream::oneshot Eric Wong
2020-03-21 2:03 ` [PATCH 07/11] qspawn: handle ENOENT (and other errors on exec) Eric Wong
2020-03-21 2:03 ` [PATCH 08/11] search: clobber -user_pfx on query parser initialization Eric Wong
2020-03-21 2:03 ` [PATCH 09/11] wwwtext: show thread endpoint w/ indexlevel=basic Eric Wong
2020-03-21 2:03 ` [PATCH 10/11] altid: warn about non-word prefixes Eric Wong
2020-03-21 2:03 ` [PATCH 11/11] www: add endpoint to retrieve altid dumps Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200321020354.9056-4-e@yhbt.net \
--to=e@yhbt.net \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).