From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 02/11] gzipfilter: lazy allocate the deflate context
Date: Sat, 21 Mar 2020 02:03:45 +0000 [thread overview]
Message-ID: <20200321020354.9056-3-e@yhbt.net> (raw)
In-Reply-To: <20200321020354.9056-1-e@yhbt.net>
zlib contexts are memory-intensive, particularly when used for
compression. Since the gzip filter may be sitting in a limiter
queue for a long period, delay the allocation we actually have
data to translate, and not a moment sooner.
---
lib/PublicInbox/GzipFilter.pm | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/lib/PublicInbox/GzipFilter.pm b/lib/PublicInbox/GzipFilter.pm
index d883130f..86409586 100644
--- a/lib/PublicInbox/GzipFilter.pm
+++ b/lib/PublicInbox/GzipFilter.pm
@@ -8,11 +8,7 @@ use bytes (); # length
use Compress::Raw::Zlib qw(Z_FINISH Z_OK);
my %OPT = (-WindowBits => 15 + 16, -AppendOutput => 1);
-sub new {
- my ($gz, $err) = Compress::Raw::Zlib::Deflate->new(%OPT);
- $err == Z_OK or die "Deflate->new failed: $err";
- bless { gz => $gz }, shift;
-}
+sub new { bless {}, shift }
# for Qspawn if using $env->{'pi-httpd.async'}
sub attach {
@@ -24,6 +20,15 @@ sub attach {
# for GetlineBody (via Qspawn) when NOT using $env->{'pi-httpd.async'}
sub translate ($$) {
my $self = $_[0];
+
+ # allocate the zlib context lazily here, instead of in ->new.
+ # Deflate contexts are memory-intensive and this object may
+ # be sitting in the Qspawn limiter queue for a while.
+ my $gz = $self->{gz} ||= do {
+ my ($g, $err) = Compress::Raw::Zlib::Deflate->new(%OPT);
+ $err == Z_OK or die "Deflate->new failed: $err";
+ $g;
+ };
my $zbuf = delete($self->{zbuf});
if (defined $_[1]) { # my $buf = $_[1];
my $err = $self->{gz}->deflate($_[1], $zbuf);
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 ` Eric Wong [this message]
2020-03-21 2:03 ` [PATCH 03/11] wwwstream: introduce oneshot API to avoid ->getline Eric Wong
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: https://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-3-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).