From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 4/7] view: remove recursion from expanded thread view
Date: Tue, 21 Jun 2016 03:11:58 +0000 [thread overview]
Message-ID: <20160621031201.28089-5-e@80x24.org> (raw)
In-Reply-To: <20160621031201.28089-1-e@80x24.org>
This should let us generate HTML for arbitrarily deep
threads without blowing the stack.
How it renders on the client side is another matter...
---
lib/PublicInbox/View.pm | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index e09fbd5..bc4a443 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -177,8 +177,13 @@ sub emit_thread_html {
pre_anchor_entry($seen, $_) for (@$msgs);
__thread_entry($state, $_, 0) for (@$msgs);
} else {
- my $th = thread_results($msgs);
- thread_entry($state, $_, 0) for $th->rootset;
+ my @q = map { (0, $_) } thread_results($msgs)->rootset;
+ while (@q) {
+ my $level = shift @q;
+ my $node = shift @q or next;
+ thread_entry($state, $level, $node);
+ unshift @q, $level+1, $node->child, $level, $node->next;
+ }
if (my $max = $state->{cur_level}) {
$state->{fh}->write(
('</ul></li>' x ($max - 1)) . '</ul>');
@@ -618,8 +623,7 @@ sub __ghost_prepare {
}
sub thread_entry {
- my ($state, $node, $level) = @_;
- return unless $node;
+ my ($state, $level, $node) = @_;
if (my $mime = $node->message) {
unless (__thread_entry($state, $mime, $level)) {
__ghost_prepare($state, $node, $level);
@@ -627,9 +631,6 @@ sub thread_entry {
} else {
__ghost_prepare($state, $node, $level);
}
-
- thread_entry($state, $node->child, $level + 1);
- thread_entry($state, $node->next, $level);
}
sub load_results {
next prev parent reply other threads:[~2016-06-21 3:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-21 3:11 [PATCH 0/7] www: avoid recursion for thread walking Eric Wong
2016-06-21 3:11 ` [PATCH 1/7] view: remove upfx parameter from thread skeleton dump Eric Wong
2016-06-21 3:11 ` [PATCH 2/7] view: remove dst " Eric Wong
2016-06-21 3:11 ` [PATCH 3/7] view: remove recursion " Eric Wong
2016-06-21 3:11 ` Eric Wong [this message]
2016-06-21 3:11 ` [PATCH 5/7] searchview: remove recursion from thread view Eric Wong
2016-06-21 3:12 ` [PATCH 6/7] view: avoid recursion in topic index Eric Wong
2016-06-21 3:12 ` [PATCH 7/7] view: common thread walking interface 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=20160621031201.28089-5-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).