From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/2] http: get rid of anonymous subs for write/close
Date: Sat, 21 Dec 2019 23:53:18 +0000 [thread overview]
Message-ID: <20191221235319.27082-2-e@80x24.org> (raw)
In-Reply-To: <20191221235319.27082-1-e@80x24.org>
Each sub costs us several kilobytes of memory for every
response we make. An arrayref only costs 80 bytes on
64-bit, so bless that to packages with appropriate ->write
and ->close methods.
---
lib/PublicInbox/HTTP.pm | 91 ++++++++++++++++++++++++++---------------
1 file changed, 59 insertions(+), 32 deletions(-)
diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm
index 53d50836..ad1a2f9f 100644
--- a/lib/PublicInbox/HTTP.pm
+++ b/lib/PublicInbox/HTTP.pm
@@ -222,22 +222,20 @@ sub response_header_write {
}
# middlewares such as Deflater may write empty strings
-sub chunked_wcb ($) {
- my ($self) = @_;
- sub {
- return if $_[0] eq '';
- msg_more($self, sprintf("%x\r\n", bytes::length($_[0])));
- msg_more($self, $_[0]);
-
- # use $self->write(\"\n\n") if you care about real-time
- # streaming responses, public-inbox WWW does not.
- msg_more($self, "\r\n");
- }
+sub chunked_write ($$) {
+ my $self = $_[0];
+ return if $_[1] eq '';
+ msg_more($self, sprintf("%x\r\n", bytes::length($_[1])));
+ msg_more($self, $_[1]);
+
+ # use $self->write(\"\n\n") if you care about real-time
+ # streaming responses, public-inbox WWW does not.
+ msg_more($self, "\r\n");
}
-sub identity_wcb ($) {
- my ($self) = @_;
- sub { $self->write(\($_[0])) if $_[0] ne '' }
+sub identity_write ($$) {
+ my $self = $_[0];
+ $self->write(\($_[1])) if $_[1] ne '';
}
sub next_request ($) {
@@ -251,17 +249,16 @@ sub next_request ($) {
}
}
-sub response_done_cb ($$) {
+sub response_done {
my ($self, $alive) = @_;
- sub {
- delete $self->{env}; # we're no longer busy
- $self->write(\"0\r\n\r\n") if $alive == 2;
- $self->write($alive ? \&next_request : \&close);
- }
+ delete $self->{env}; # we're no longer busy
+ $self->write(\"0\r\n\r\n") if $alive == 2;
+ $self->write($alive ? \&next_request : \&close);
}
-sub getline_response ($$$) {
- my ($self, $write, $close) = @_;
+sub getline_response ($$) {
+ my ($self, $alive) = @_;
+ my $write = $alive == 2 ? \&chunked_write : \&identity_write;
my $pull; # DANGER: self-referential
$pull = sub {
my $forward = $self->{forward};
@@ -273,13 +270,14 @@ sub getline_response ($$$) {
} if $forward;
if (defined $buf) {
- $write->($buf); # may close in PublicInbox::DS::write
+ # may close in PublicInbox::DS::write
+ $write->($self, $buf);
if ($self->{sock}) {
my $wbuf = $self->{wbuf} ||= [];
push @$wbuf, $pull;
- # wbuf may be populated by $write->($buf),
+ # wbuf may be populated by $write->(...$buf),
# no need to rearm if so:
$self->requeue if scalar(@$wbuf) == 1;
return; # likely
@@ -299,7 +297,7 @@ sub getline_response ($$$) {
}
}
$forward = undef;
- $close->(); # call response_done_cb
+ response_done($self, $alive);
};
$pull->(); # kick-off!
@@ -308,19 +306,23 @@ sub getline_response ($$$) {
sub response_write {
my ($self, $env, $res) = @_;
my $alive = response_header_write($self, $env, $res);
- my $close = response_done_cb($self, $alive);
- my $write = $alive == 2 ? chunked_wcb($self) : identity_wcb($self);
if (defined(my $body = $res->[2])) {
if (ref $body eq 'ARRAY') {
- $write->($_) foreach @$body;
- $close->();
+ if ($alive == 2) {
+ chunked_write($self, $_) for @$body;
+ } else {
+ identity_write($self, $_) for @$body;
+ }
+ response_done($self, $alive);
} else {
$self->{forward} = $body;
- getline_response($self, $write, $close);
+ getline_response($self, $alive);
}
+ # these are returned to the calling application:
+ } elsif ($alive == 2) {
+ bless [ $self, $alive ], 'PublicInbox::HTTP::Chunked';
} else {
- # this is returned to the calling application:
- Plack::Util::inline_object(write => $write, close => $close);
+ bless [ $self, $alive ], 'PublicInbox::HTTP::Identity';
}
}
@@ -466,4 +468,29 @@ sub busy () {
($self->{rbuf} || $self->{env} || $self->{wbuf});
}
+# Chunked and Identity packages are used for writing responses.
+# They may be exposed to the PSGI application when the PSGI app
+# returns a CODE ref for "push"-based responses
+package PublicInbox::HTTP::Chunked;
+use strict;
+
+sub write {
+ # ([$http], $buf) = @_;
+ PublicInbox::HTTP::chunked_write($_[0]->[0], $_[1])
+}
+
+sub close {
+ # $_[0] = [$http, $alive]
+ PublicInbox::HTTP::response_done(@{$_[0]});
+}
+
+package PublicInbox::HTTP::Identity;
+use strict;
+our @ISA = qw(PublicInbox::HTTP::Chunked);
+
+sub write {
+ # ([$http], $buf) = @_;
+ PublicInbox::HTTP::identity_write($_[0]->[0], $_[1]);
+}
+
1;
next prev parent reply other threads:[~2019-12-21 23:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-21 23:53 [PATCH 0/2] http: remove most anonymous subs Eric Wong
2019-12-21 23:53 ` Eric Wong [this message]
2019-12-21 23:53 ` [PATCH 2/2] http: avoid anonymous sub for getline callback 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=20191221235319.27082-2-e@80x24.org \
--to=e@80x24.org \
--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).