user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 25/38] view: switch a few things to ctx->zmore
Date: Sat, 10 Sep 2022 08:17:16 +0000	[thread overview]
Message-ID: <20220910081729.2011934-26-e@80x24.org> (raw)
In-Reply-To: <20220910081729.2011934-1-e@80x24.org>

Unfortunately, this is actually slower.  However, this
hopefully makes it easier to improve the internals and
make performance improvements down the line.
---
 lib/PublicInbox/View.pm     | 14 +++++-------
 lib/PublicInbox/ViewDiff.pm | 45 +++++++++++++++++--------------------
 2 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 2f99179e..3dbf8bac 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -560,7 +560,7 @@ sub add_text_body { # callback for each_part
 	my ($part, $depth, $idx) = @$p;
 	my $ct = $part->content_type || 'text/plain';
 	my $fn = $part->filename;
-	my $rv = $ctx->{obuf};
+	my $rv = $ctx->{obuf} //= \(my $obuf = '');
 	my ($s, $err) = msg_part_text($part, $ct);
 	$s // return $$rv .= (attach_link($ctx, $ct, $p, $fn) // '');
 	if ($part->{is_submsg}) {
@@ -618,18 +618,16 @@ sub add_text_body { # callback for each_part
 		$$rv .= "\n";
 	}
 	delete $part->{bdy}; # save memory
-	foreach my $cur (@sections) {
+	for my $cur (@sections) { # $cur may be huge
 		if ($cur =~ /\A>/) {
 			# we use a <span> here to allow users to specify
 			# their own color for quoted text
-			$$rv .= qq(<span\nclass="q">);
-			$$rv .= $l->to_html($cur);
-			$$rv .= '</span>';
+			$ctx->zmore(qq(<span\nclass="q">),
+					$l->to_html($cur), '</span>');
 		} elsif ($diff) {
 			flush_diff($ctx, \$cur);
-		} else {
-			# regular lines, OK
-			$$rv .= $l->to_html($cur);
+		} else { # regular lines, OK
+			$ctx->zmore($l->to_html($cur));
 		}
 		undef $cur; # free memory
 	}
diff --git a/lib/PublicInbox/ViewDiff.pm b/lib/PublicInbox/ViewDiff.pm
index 076aa1af..36601910 100644
--- a/lib/PublicInbox/ViewDiff.pm
+++ b/lib/PublicInbox/ViewDiff.pm
@@ -156,10 +156,7 @@ sub diff_header ($$$) {
 		warn "BUG? <$$x> had no ^index line";
 	}
 	$$x =~ s!^diff --git!anchor1($ctx, $pb) // 'diff --git'!ems;
-	my $dst = $ctx->{obuf};
-	$$dst .= qq(<span\nclass="head">);
-	$$dst .= $$x;
-	$$dst .= '</span>';
+	$ctx->zmore(qq(<span\nclass="head">$$x</span>));
 	$dctx;
 }
 
@@ -182,9 +179,10 @@ sub diff_before_or_after ($$) {
 		my $ch = $ctx->{changed_href} // '#related';
 		$$x .= qq(<a href="$ch">changed</a>,);
 		$$x .= ascii_html(pop @x); # $4: insertions/deletions
-		$$x .= $lnk->to_html(pop @x); # notes, commit message, etc
+		# notes, commit message, etc
+		$ctx->zmore($$x .= $lnk->to_html(pop @x));
 	} else {
-		$ctx->{-linkify}->to_html($$x);
+		$ctx->zmore($ctx->{-linkify}->to_html($$x));
 	}
 }
 
@@ -195,8 +193,7 @@ sub flush_diff ($$) {
 	my @top = split($EXTRACT_DIFFS, $$cur);
 	undef $$cur; # free memory
 
-	my $linkify = $ctx->{-linkify};
-	my $dst = $ctx->{obuf};
+	my $lnk = $ctx->{-linkify};
 	my $dctx; # {}, keys: Q, oid_a, oid_b
 
 	while (defined(my $x = shift @top)) {
@@ -223,28 +220,28 @@ sub flush_diff ($$) {
 				if (!defined($dctx)) {
 					$after .= $s;
 				} elsif ($s =~ s/\A@@ (\S+) (\S+) @@//) {
-					$$dst .= qq(<span\nclass="hunk">);
-					$$dst .= diff_hunk($dctx, $1, $2);
-					$$dst .= $linkify->to_html($s);
-					$$dst .= '</span>';
-				} elsif ($s =~ /\A\+/) {
-					$$dst .= qq(<span\nclass="add">);
-					$$dst .= $linkify->to_html($s);
-					$$dst .= '</span>';
+					$ctx->zmore(qq(<span\nclass="hunk">) .
+						diff_hunk($dctx, $1, $2) .
+						$lnk->to_html($s) .
+						'</span>');
+				} elsif ($s =~ /\A\+/) { # $s may be huge
+					$ctx->zmore(qq(<span\nclass="add">),
+							$lnk->to_html($s),
+							'</span>');
 				} elsif ($s =~ /\A-- $/sm) { # email sig starts
 					$dctx = undef;
 					$after .= $s;
-				} elsif ($s =~ /\A-/) {
-					$$dst .= qq(<span\nclass="del">);
-					$$dst .= $linkify->to_html($s);
-					$$dst .= '</span>';
-				} else {
-					$$dst .= $linkify->to_html($s);
+				} elsif ($s =~ /\A-/) { # $s may be huge
+					$ctx->zmore(qq(<span\nclass="del">),
+						$lnk->to_html($s),
+						'</span>');
+				} else { # $s may be huge
+					$ctx->zmore($lnk->to_html($s));
 				}
 			}
-			$$dst .= diff_before_or_after($ctx, \$after) if !$dctx;
+			diff_before_or_after($ctx, \$after) if !$dctx;
 		} else {
-			$$dst .= diff_before_or_after($ctx, \$x);
+			diff_before_or_after($ctx, \$x);
 		}
 	}
 }

  parent reply	other threads:[~2022-09-10  8:18 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-10  8:16 [PATCH 00/38] www: reduce memory usage Eric Wong
2022-09-10  8:16 ` [PATCH 01/38] xt: fold perf-obfuscate into perf-msgview, future-proof Eric Wong
2022-09-10  8:16 ` [PATCH 02/38] www: gzip_filter: implicitly flush {obuf} on zmore/zflush Eric Wong
2022-09-10  8:16 ` [PATCH 03/38] view: rework single message page to compress earlier Eric Wong
2022-09-10  8:16 ` [PATCH 04/38] www_atom_stream: require 200 response Eric Wong
2022-09-10  8:16 ` [PATCH 05/38] www_stream: aresponse assumes 200, too Eric Wong
2022-09-10  8:16 ` [PATCH 06/38] www_text: reduce parameter passing for response header Eric Wong
2022-09-10  8:16 ` [PATCH 07/38] viewvcs: use shorter and simpler ctx->html_done Eric Wong
2022-09-10  8:16 ` [PATCH 08/38] www_listing: consolidate some ->zmore dispatches Eric Wong
2022-09-10  8:17 ` [PATCH 09/38] www_listing: avoid unnecessary work for common cases Eric Wong
2022-09-10  8:17 ` [PATCH 10/38] www: viewdiff: use return value for diff_hunk Eric Wong
2022-09-10  8:17 ` [PATCH 11/38] view: simplify _parent_headers Eric Wong
2022-09-10  8:17 ` [PATCH 12/38] view: eml_entry: reduce manipulation of ctx->{obuf} Eric Wong
2022-09-10  8:17 ` [PATCH 13/38] gzip_filter: ->translate can reuse zmore/zflush Eric Wong
2022-09-10  8:17 ` [PATCH 14/38] view: remove multipart_text_as_html Eric Wong
2022-09-10  8:17 ` [PATCH 15/38] view: reduce subroutine calls for submsg_hdr Eric Wong
2022-09-10  8:17 ` [PATCH 16/38] view: attach_link: reduce obuf manipulation Eric Wong
2022-09-10  8:17 ` [PATCH 17/38] viewdiff: reuse existing string in diff_before_or_after Eric Wong
2022-09-10  8:17 ` [PATCH 18/38] view: _th_index_lite: avoid one s///, improve symmetry Eric Wong
2022-09-10  8:17 ` [PATCH 19/38] view: _th_index_lite: use `//' defined-or op Eric Wong
2022-09-10  8:17 ` [PATCH 20/38] view: reduce ascii_html calls and {obuf} use Eric Wong
2022-09-10  8:17 ` [PATCH 21/38] view: html_footer: golf out a few lines Eric Wong
2022-09-10  8:17 ` [PATCH 22/38] view: html_footer: remove obuf dependency Eric Wong
2022-09-10  8:17 ` [PATCH 23/38] view: html_footer: avoid escaping " in a few places Eric Wong
2022-09-10  8:17 ` [PATCH 24/38] viewdiff: diff_hunk: shorten conditionals, slightly Eric Wong
2022-09-10  8:17 ` Eric Wong [this message]
2022-09-10  8:17 ` [PATCH 26/38] www: drop {obuf} use entirely, for now Eric Wong
2022-09-10  8:17 ` [PATCH 27/38] www: switch to zadd for the majority of buffering Eric Wong
2022-09-10  8:17 ` [PATCH 28/38] www: use PerlIO::scalar (zfh) for buffering Eric Wong
2022-09-10  8:17 ` [PATCH 29/38] viewdiff: diff_before_or_after: avoid extra capture Eric Wong
2022-09-10  8:17 ` [PATCH 30/38] viewdiff: diff_header: shorten function, slightly Eric Wong
2022-09-10  8:17 ` [PATCH 31/38] www_static: switch to `print $zfh', and optimize Eric Wong
2022-09-10  8:17 ` [PATCH 32/38] httpd/async: describe which ->write subs it can call Eric Wong
2022-09-10  8:17 ` [PATCH 33/38] translate: support multiple buffer args Eric Wong
2022-09-10  8:17 ` [PATCH 34/38] gzip_filter: write: use multi-arg translate Eric Wong
2022-09-10  8:17 ` [PATCH 35/38] feed: new_html_i: switch from zmore to `print $zfh' Eric Wong
2022-09-10  8:17 ` [PATCH 36/38] mbox*: use multi-arg ->translate and ->write Eric Wong
2022-09-10  8:17 ` [PATCH 37/38] www_listing: switch to `print $zfh' Eric Wong
2022-09-10  8:17 ` [PATCH 38/38] viewvcs: " 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=20220910081729.2011934-26-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).