From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 04/17] thread: remove accessor usage in internals
Date: Wed, 5 Oct 2016 23:57:09 +0000 [thread overview]
Message-ID: <20161005235722.14857-5-e@80x24.org> (raw)
In-Reply-To: <20161005235722.14857-1-e@80x24.org>
This improves top-level index generation performance by 3-4%.
---
lib/PublicInbox/SearchThread.pm | 72 +++++++++++++++++++----------------------
1 file changed, 34 insertions(+), 38 deletions(-)
diff --git a/lib/PublicInbox/SearchThread.pm b/lib/PublicInbox/SearchThread.pm
index e086132..53fec97 100644
--- a/lib/PublicInbox/SearchThread.pm
+++ b/lib/PublicInbox/SearchThread.pm
@@ -66,7 +66,8 @@ sub rootset { @{$_[0]{rootset}} }
sub thread {
my $self = shift;
$self->_setup();
- $self->{rootset} = [ grep { !$_->parent } values %{$self->{id_table}} ];
+ $self->{rootset} = [
+ grep { !$_->{parent} } values %{$self->{id_table}} ];
$self->_finish();
}
@@ -95,7 +96,7 @@ sub _add_message ($$) {
# A. if id_table...
my $this_container = $self->_get_cont_for_id($self->_msgid($message));
- $this_container->message($message);
+ $this_container->{message} = $message;
# B. For each element in the message's References field:
my @refs = $self->_references($message);
@@ -112,7 +113,7 @@ sub _add_message ($$) {
# a loop...
if ($prev &&
- !$container->parent && # already linked
+ !$container->{parent} && # already linked
!$container->has_descendent($prev) # would loop
) {
$prev->add_child($container);
@@ -152,10 +153,9 @@ use Scalar::Util qw(weaken);
sub new { my $self = shift; bless { id => shift }, $self; }
-sub message { $_[0]->{message} = $_[1] if @_ == 2; $_[0]->{message} }
-sub parent { @_ == 2 ? weaken($_[0]->{parent} = $_[1]) : $_[0]->{parent} }
-sub child { $_[0]->{child} = $_[1] if @_ == 2; $_[0]->{child} }
-sub next { $_[0]->{next} = $_[1] if @_ == 2; $_[0]->{next} }
+sub message { $_[0]->{message} }
+sub child { $_[0]->{child} }
+sub next { $_[0]->{next} }
sub messageid { $_[0]->{id} }
sub add_child {
@@ -165,41 +165,39 @@ sub add_child {
if (grep { $_ == $child } @{$self->children}) {
# All is potentially correct with the world
- $child->parent($self);
+ weaken($child->{parent} = $self);
return;
}
- $child->parent->remove_child($child) if $child->parent;
+ my $parent = $child->{parent};
+ remove_child($parent, $child) if $parent;
- $child->next($self->child);
- $self->child($child);
- $child->parent($self);
+ $child->{next} = $self->{child};
+ $self->{child} = $child;
+ weaken($child->{parent} = $self);
}
sub remove_child {
my ($self, $child) = @_;
- return unless $self->child;
- if ($self->child == $child) { # First one's easy.
- $self->child($child->next);
- $child->next(undef);
- $child->parent(undef);
+
+ my $x = $self->{child} or return;
+ if ($x == $child) { # First one's easy.
+ $self->{child} = $child->{next};
+ $child->{parent} = $child->{next} = undef;
return;
}
- my $x = $self->child;
my $prev = $x;
- while ($x = $x->next) {
+ while ($x = $x->{next}) {
if ($x == $child) {
- $prev->next($x->next); # Unlink x
- $x->next(undef);
- $x->parent(undef); # Deparent it
+ $prev->{next} = $x->{next}; # Unlink x
+ $x->{next} = $x->{parent} = undef; # Deparent it
return;
}
$prev = $x;
}
# oddly, we can get here
- $child->next(undef);
- $child->parent(undef);
+ $child->{next} = $child->{parent} = undef;
}
sub has_descendent {
@@ -215,10 +213,10 @@ sub has_descendent {
sub children {
my $self = shift;
my @children;
- my $visitor = $self->child;
+ my $visitor = $self->{child};
while ($visitor) {
push @children, $visitor;
- $visitor = $visitor->next
+ $visitor = $visitor->{next};
}
\@children;
}
@@ -256,16 +254,16 @@ sub recurse_down {
$seen{$cont}++;
$callback->($cont);
- if (my $next = $cont->next) {
+ if (my $next = $cont->{next}) {
if ($seen{$next}) {
- $cont->next(undef);
+ $cont->{next} = undef;
} else {
push @q, $next;
}
}
- if (my $child = $cont->child) {
+ if (my $child = $cont->{child}) {
if ($seen{$child}) {
- $cont->child(undef);
+ $cont->{child} = undef;
} else {
push @q, $child;
}
@@ -288,16 +286,14 @@ sub iterate_down {
# spot/break loops
$seen{$walk}++;
- my $child = $walk->child;
+ my $child = $walk->{child};
if ($child && $seen{$child}) {
- $walk->child(undef);
- $child = undef;
+ $walk->{child} = $child = undef;
}
- my $next = $walk->next;
+ my $next = $walk->{next};
if ($next && $seen{$next}) {
- $walk->next(undef);
- $next = undef;
+ $walk->{next} = $next = undef;
}
# go down, or across
@@ -310,9 +306,9 @@ sub iterate_down {
if (!$next) {
my $up = $walk;
while ($up && !$next) {
- $up = $up->parent;
+ $up = $up->{parent};
--$depth;
- $next = $up->next if $up;
+ $next = $up->{next} if $up;
}
}
$walk = $next;
--
EW
next prev parent reply other threads:[~2016-10-05 23:57 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-05 23:57 [PATCH 0/17] remove Mail::Thread dependency Eric Wong
2016-10-05 23:57 ` [PATCH 01/17] view: remove "subject dummy" references Eric Wong
2016-10-05 23:57 ` [PATCH 02/17] thread: remove Mail::Thread dependency Eric Wong
2016-10-05 23:57 ` [PATCH 03/17] thread: pass array refs instead of entire arrays Eric Wong
2016-10-05 23:57 ` Eric Wong [this message]
2016-10-05 23:57 ` [PATCH 05/17] inbox: deal with ghost smsg Eric Wong
2016-10-05 23:57 ` [PATCH 06/17] thread: remove Email::Abstract wrapping Eric Wong
2016-10-05 23:57 ` [PATCH 07/17] thread: remove rootset accessor method Eric Wong
2016-10-05 23:57 ` [PATCH 08/17] thread: simplify Eric Wong
2016-10-05 23:57 ` [PATCH 09/17] thread: remove iterate_down Eric Wong
2016-10-05 23:57 ` [PATCH 10/17] thread: avoid incrementing undefined value Eric Wong
2016-10-05 23:57 ` [PATCH 11/17] thread: order_children no longer cares about depth Eric Wong
2016-10-05 23:57 ` [PATCH 12/17] thread: inline and remove recurse_down logic Eric Wong
2016-10-05 23:57 ` [PATCH 13/17] thread: fix sorting without topmost Eric Wong
2016-10-14 21:17 ` [PATCH] thread: reinstates stable ordering when ghosts are present Eric Wong
2016-10-05 23:57 ` [PATCH 14/17] thread: use hash + array instead of hand-rolled linked list Eric Wong
2016-10-05 23:57 ` [PATCH 15/17] view: remove redundant children array in thread views Eric Wong
2016-10-05 23:57 ` [PATCH 16/17] t/thread-cycle: test self-referential messages Eric Wong
2016-10-05 23:57 ` [PATCH 17/17] thread: remove weaken dependency Eric Wong
2016-10-06 8:22 ` [PATCH 0/17] remove Mail::Thread dependency Eric Wong
2016-10-13 3:59 ` [PATCH 0/2] thread: fix regressions from Mail::Thread removal Eric Wong
2016-10-13 3:59 ` [PATCH 1/2] thread: reduce indentation level Eric Wong
2016-10-13 3:59 ` [PATCH 2/2] thread: fix parent/child relationships 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: http://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=20161005235722.14857-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).