From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 9551F1F61C for ; Sat, 21 Mar 2020 02:03:54 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 02/11] gzipfilter: lazy allocate the deflate context Date: Sat, 21 Mar 2020 02:03:45 +0000 Message-Id: <20200321020354.9056-3-e@yhbt.net> In-Reply-To: <20200321020354.9056-1-e@yhbt.net> References: <20200321020354.9056-1-e@yhbt.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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);