From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 4/4] linkify: modify argument in place
Date: Sat, 24 Dec 2016 11:52:44 +0000 [thread overview]
Message-ID: <20161224115244.15402-5-e@80x24.org> (raw)
In-Reply-To: <20161224115244.15402-1-e@80x24.org>
This results in over 1% speedup doing $MESSAGE_ID/T/ HTML
generation for a 368-message thread.
---
lib/PublicInbox/Linkify.pm | 17 +++++++----------
lib/PublicInbox/View.pm | 5 ++---
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/lib/PublicInbox/Linkify.pm b/lib/PublicInbox/Linkify.pm
index acd2a47..8e1728c 100644
--- a/lib/PublicInbox/Linkify.pm
+++ b/lib/PublicInbox/Linkify.pm
@@ -22,11 +22,10 @@ my $LINK_RE = qr{(\()?\b((?:ftps?|https?|nntps?|gopher)://
(?:\#[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%\?]+)?
)}xi;
-sub new { bless {}, shift }
+sub new { bless {}, $_[0] }
sub linkify_1 {
- my ($self, $s) = @_;
- $s =~ s!$LINK_RE!
+ $_[1] =~ s!$LINK_RE!
my $beg = $1 || '';
my $url = $2;
my $end = '';
@@ -50,19 +49,17 @@ sub linkify_1 {
# only escape ampersands, others do not match LINK_RE
$url =~ s/&/&/g;
- $self->{$key} = $url;
+ $_[0]->{$key} = $url;
$beg . 'PI-LINK-'. $key . $end;
!ge;
- $s;
+ $_[1];
}
sub linkify_2 {
- my ($self, $s) = @_;
-
# Added "PI-LINK-" prefix to avoid false-positives on git commits
- $s =~ s!\bPI-LINK-([a-f0-9]{40})\b!
+ $_[1] =~ s!\bPI-LINK-([a-f0-9]{40})\b!
my $key = $1;
- my $url = $self->{$key};
+ my $url = $_[0]->{$key};
if (defined $url) {
"<a\nhref=\"$url\">$url</a>";
} else {
@@ -70,7 +67,7 @@ sub linkify_2 {
$key;
}
!ge;
- $s;
+ $_[1];
}
1;
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 39ca959..e4e9d7d 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -482,9 +482,8 @@ sub add_text_body {
flush_quote(\$s, $l, \@quot) if @quot;
# regular line, OK
- $cur = $l->linkify_1($cur);
- $cur = ascii_html($cur);
- $s .= $l->linkify_2($cur);
+ $l->linkify_1($cur);
+ $s .= $l->linkify_2(ascii_html($cur));
} else {
push @quot, $cur;
}
--
EW
prev parent reply other threads:[~2016-12-24 11:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-24 11:52 [PATCH 0/4] HTML micro-optimizations Eric Wong
2016-12-24 11:52 ` [PATCH 1/4] view: remove unused parameter Eric Wong
2016-12-24 11:52 ` [PATCH 2/4] view: stop chomping off whitespace at ends of messages Eric Wong
2016-12-24 11:52 ` [PATCH 3/4] view: do not modify array during iteration Eric Wong
2016-12-24 11:52 ` Eric Wong [this message]
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=20161224115244.15402-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.
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).