From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <e@80x24.org>
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 9B8FA1FB9E
	for <meta@public-inbox.org>; Wed, 25 Dec 2019 07:51:08 +0000 (UTC)
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 20/30] view: msg_html: stop using an anonymous sub
Date: Wed, 25 Dec 2019 07:50:54 +0000
Message-Id: <20191225075104.22184-21-e@80x24.org>
In-Reply-To: <20191225075104.22184-1-e@80x24.org>
References: <20191225075104.22184-1-e@80x24.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
List-Id: <meta.public-inbox.org>

Stash 5 local variables into the WWW $ctx hash table instead of
allocating several kilobytes for an anonymous sub.
---
 lib/PublicInbox/View.pm | 57 +++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 1ce6ba85..1e2d3b55 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -24,37 +24,44 @@ use constant INDENT => '  ';
 use constant TCHILD => '` ';
 sub th_pfx ($) { $_[0] == 0 ? '' : TCHILD };
 
+sub msg_html_i {
+	my ($nr, $ctx) = @_;
+	my $more = $ctx->{more};
+	if ($nr == 1) {
+		# $more cannot be true w/o $smsg being defined:
+		my $upfx = $more ? '../'.mid_escape($ctx->{smsg}->mid).'/' : '';
+		$ctx->{tip} .
+			multipart_text_as_html($ctx->{mime}, $upfx, $ctx) .
+			'</pre><hr>'
+	} elsif ($more && @$more) {
+		++$ctx->{end_nr};
+		msg_html_more($ctx, $more, $nr);
+	} elsif ($nr == $ctx->{end_nr}) {
+		# fake an EOF if generating the footer fails;
+		# we want to at least show the message if something
+		# here crashes:
+		eval {
+			my $hdr = delete($ctx->{mime})->header_obj;
+			'<pre>' . html_footer($hdr, 1, $ctx) .
+			'</pre>' . msg_reply($ctx, $hdr)
+		};
+	} else {
+		undef
+	}
+}
+
 # public functions: (unstable)
 
 sub msg_html {
 	my ($ctx, $mime, $more, $smsg) = @_;
-	my $hdr = $mime->header_obj;
 	my $ibx = $ctx->{-inbox};
 	$ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
-	my $tip = _msg_html_prepare($hdr, $ctx, $more, 0);
-	my $end = 2;
-	PublicInbox::WwwStream->response($ctx, 200, sub {
-		my ($nr, undef) = @_;
-		if ($nr == 1) {
-			# $more cannot be true w/o $smsg being defined:
-			my $upfx = $more ? '../'.mid_escape($smsg->mid).'/' : '';
-			$tip . multipart_text_as_html($mime, $upfx, $ctx) .
-				'</pre><hr>'
-		} elsif ($more && @$more) {
-			++$end;
-			msg_html_more($ctx, $more, $nr);
-		} elsif ($nr == $end) {
-			# fake an EOF if generating the footer fails;
-			# we want to at least show the message if something
-			# here crashes:
-			eval {
-				'<pre>' . html_footer($hdr, 1, $ctx) .
-				'</pre>' . msg_reply($ctx, $hdr)
-			};
-		} else {
-			undef
-		}
-	});
+	$ctx->{tip} = _msg_html_prepare($mime->header_obj, $ctx, $more, 0);
+	$ctx->{more} = $more;
+	$ctx->{end_nr} = 2;
+	$ctx->{smsg} = $smsg;
+	$ctx->{mime} = $mime;
+	PublicInbox::WwwStream->response($ctx, 200, \&msg_html_i);
 }
 
 sub msg_page {