* [PATCH 0/2] http: remove most anonymous subs
@ 2019-12-21 23:53 7% Eric Wong
2019-12-21 23:53 6% ` [PATCH 2/2] http: avoid anonymous sub for getline callback Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2019-12-21 23:53 UTC (permalink / raw)
To: meta
subroutine allocation costs several thousand kilobytes every
response and their (temporary) self-referential usage increases
the likelyhood of memory leaks.
The only remaining anonymous sub in HTTP.pm is required by the
PSGI interface for push responses (e.g. Qspawn).
Eric Wong (2):
http: get rid of anonymous subs for write/close callbacks
http: avoid anonymous sub for getline callback
lib/PublicInbox/HTTP.pm | 160 +++++++++++++++++++++++-----------------
1 file changed, 92 insertions(+), 68 deletions(-)
^ permalink raw reply [relevance 7%]
* [PATCH 2/2] http: avoid anonymous sub for getline callback
2019-12-21 23:53 7% [PATCH 0/2] http: remove most anonymous subs Eric Wong
@ 2019-12-21 23:53 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2019-12-21 23:53 UTC (permalink / raw)
To: meta
We can avoid the danger of self-referential subs entirely for
code internal to PublicInbox::HTTP.
This change was only made possible by
commit 8e1c3155da4edc082e8e3d8b30351f0c861757a7
("ds: pass $self to code references")
---
lib/PublicInbox/HTTP.pm | 85 ++++++++++++++++++++---------------------
1 file changed, 41 insertions(+), 44 deletions(-)
diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm
index ad1a2f9f..e350daaf 100644
--- a/lib/PublicInbox/HTTP.pm
+++ b/lib/PublicInbox/HTTP.pm
@@ -11,7 +11,7 @@ package PublicInbox::HTTP;
use strict;
use warnings;
use base qw(PublicInbox::DS);
-use fields qw(httpd env input_left remote_addr remote_port forward);
+use fields qw(httpd env input_left remote_addr remote_port forward alive);
use bytes (); # only for bytes::length
use Fcntl qw(:seek);
use Plack::HTTPParser qw(parse_http_request); # XS or pure Perl
@@ -256,51 +256,47 @@ sub response_done {
$self->write($alive ? \&next_request : \&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};
- # limit our own running time for fairness with other
- # clients and to avoid buffering too much:
- my $buf = eval {
- local $/ = \8192;
- $forward->getline;
- } if $forward;
-
- if (defined $buf) {
- # 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),
- # no need to rearm if so:
- $self->requeue if scalar(@$wbuf) == 1;
- return; # likely
- }
- } elsif ($@) {
- err($self, "response ->getline error: $@");
- $self->close;
+sub getline_pull {
+ my ($self) = @_;
+ my $forward = $self->{forward};
+
+ # limit our own running time for fairness with other
+ # clients and to avoid buffering too much:
+ my $buf = eval {
+ local $/ = \8192;
+ $forward->getline;
+ } if $forward;
+
+ if (defined $buf) {
+ # may close in PublicInbox::DS::write
+ if ($self->{alive} == 2) {
+ chunked_write($self, $buf);
+ } else {
+ identity_write($self, $buf);
}
- $pull = undef; # all done!
- # avoid recursion
- if (delete $self->{forward}) {
- eval { $forward->close };
- if ($@) {
- err($self, "response ->close error: $@");
- $self->close; # idempotent
- }
- }
- $forward = undef;
- response_done($self, $alive);
- };
+ if ($self->{sock}) {
+ my $wbuf = $self->{wbuf} //= [];
+ push @$wbuf, \&getline_pull;
- $pull->(); # kick-off!
+ # wbuf may be populated by {chunked,identity}_write()
+ # above, no need to rearm if so:
+ $self->requeue if scalar(@$wbuf) == 1;
+ return; # likely
+ }
+ } elsif ($@) {
+ err($self, "response ->getline error: $@");
+ $self->close;
+ }
+ # avoid recursion
+ if (delete $self->{forward}) {
+ eval { $forward->close };
+ if ($@) {
+ err($self, "response ->close error: $@");
+ $self->close; # idempotent
+ }
+ }
+ response_done($self, delete $self->{alive});
}
sub response_write {
@@ -316,7 +312,8 @@ sub response_write {
response_done($self, $alive);
} else {
$self->{forward} = $body;
- getline_response($self, $alive);
+ $self->{alive} = $alive;
+ getline_pull($self); # kick-off!
}
# these are returned to the calling application:
} elsif ($alive == 2) {
^ permalink raw reply related [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2019-12-21 23:53 7% [PATCH 0/2] http: remove most anonymous subs Eric Wong
2019-12-21 23:53 6% ` [PATCH 2/2] http: avoid anonymous sub for getline callback Eric Wong
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).