From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 5/7] searchview: remove recursion from thread view
Date: Tue, 21 Jun 2016 03:11:59 +0000 [thread overview]
Message-ID: <20160621031201.28089-6-e@80x24.org> (raw)
In-Reply-To: <20160621031201.28089-1-e@80x24.org>
As before, recursion can cause problems sooner than unshifting
objects into the head of a queue.
---
lib/PublicInbox/SearchView.pm | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 6f67a37..ba25827 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -151,7 +151,6 @@ sub tdump {
$m;
} ($mset->items);
- my @rootset;
my $th = PublicInbox::Thread->new(@m);
$th->thread;
if ($q->{r}) { # order by relevance
@@ -164,7 +163,6 @@ sub tdump {
} else { # order by time (default for threaded view)
$th->order(*PublicInbox::View::sort_ts);
}
- @rootset = $th->rootset;
my $state = {
ctx => $ctx,
anchor_idx => 0,
@@ -174,7 +172,13 @@ sub tdump {
fh => $fh,
};
$ctx->{searchview} = 1;
- tdump_ent($state, $_, 0) for @rootset;
+ my @q = map { (0, $_) } $th->rootset;
+ while (@q) {
+ my $level = shift @q;
+ my $node = shift @q or next;
+ tdump_ent($state, $level, $node);
+ unshift @q, $level+1, $node->child, $level, $node->next;
+ }
PublicInbox::View::thread_adj_level($state, 0);
$fh->write(search_nav_bot($mset, $q). "\n\n" .
@@ -184,8 +188,7 @@ sub tdump {
}
sub tdump_ent {
- my ($state, $node, $level) = @_;
- return unless $node;
+ my ($state, $level, $node) = @_;
my $mime = $node->message;
if ($mime) {
@@ -202,8 +205,6 @@ sub tdump_ent {
my $mid = $node->messageid;
PublicInbox::View::ghost_flush($state, '', $mid, $level);
}
- tdump_ent($state, $node->child, $level + 1);
- tdump_ent($state, $node->next, $level);
}
sub foot {
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 ` [PATCH 4/7] view: remove recursion from expanded thread view Eric Wong
2016-06-21 3:11 ` Eric Wong [this message]
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-6-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).