From: Eric Wong <e@80x24.org>
To: unicorn-public@bogomips.org
Subject: [PATCH] favor more string literals for cold call sites
Date: Tue, 7 Apr 2015 07:56:15 +0000 [thread overview]
Message-ID: <1428393375-22083-1-git-send-email-e@80x24.org> (raw)
Literal regexps cost over 450 bytes of memory per-site and
unnecessary use of them costs memory in places where raw execution
speed does not matter. Nowadays, we can rely on String#end_with?
(introduced in 1.8.7) for improved readability, too.
---
bin/unicorn | 2 +-
bin/unicorn_rails | 2 +-
lib/unicorn/configurator.rb | 4 ++--
lib/unicorn/http_server.rb | 2 +-
lib/unicorn/socket_helper.rb | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/bin/unicorn b/bin/unicorn
index c272e43..3c5e5cb 100755
--- a/bin/unicorn
+++ b/bin/unicorn
@@ -29,7 +29,7 @@ op = OptionParser.new("", 24, ' ') do |opts|
opts.on("-I", "--include PATH",
"specify $LOAD_PATH (may be used more than once)") do |path|
- $LOAD_PATH.unshift(*path.split(/:/))
+ $LOAD_PATH.unshift(*path.split(':'))
end
opts.on("-r", "--require LIBRARY",
diff --git a/bin/unicorn_rails b/bin/unicorn_rails
index b080846..ea4f822 100755
--- a/bin/unicorn_rails
+++ b/bin/unicorn_rails
@@ -30,7 +30,7 @@ op = OptionParser.new("", 24, ' ') do |opts|
opts.on("-I", "--include PATH",
"specify $LOAD_PATH (may be used more than once)") do |path|
- $LOAD_PATH.unshift(*path.split(/:/))
+ $LOAD_PATH.unshift(*path.split(':'))
end
opts.on("-r", "--require LIBRARY",
diff --git a/lib/unicorn/configurator.rb b/lib/unicorn/configurator.rb
index 69b4644..32e49c1 100644
--- a/lib/unicorn/configurator.rb
+++ b/lib/unicorn/configurator.rb
@@ -586,7 +586,7 @@ private
def canonicalize_tcp(addr, port)
packed = Socket.pack_sockaddr_in(port, addr)
port, addr = Socket.unpack_sockaddr_in(packed)
- /:/ =~ addr ? "[#{addr}]:#{port}" : "#{addr}:#{port}"
+ addr.include?(':') ? "[#{addr}]:#{port}" : "#{addr}:#{port}"
end
def set_path(var, path) #:nodoc:
@@ -642,7 +642,7 @@ private
raise ArgumentError, "rackup file (#{ru}) not readable"
# it could be a .rb file, too, we don't parse those manually
- ru =~ /\.ru\z/ or return
+ ru.end_with?('.ru') or return
/^#\\(.*)/ =~ File.read(ru) or return
RACKUP[:optparse].parse!($1.split(/\s+/))
diff --git a/lib/unicorn/http_server.rb b/lib/unicorn/http_server.rb
index 77345d2..a726c91 100644
--- a/lib/unicorn/http_server.rb
+++ b/lib/unicorn/http_server.rb
@@ -186,7 +186,7 @@ class Unicorn::HttpServer
if path
if x = valid_pid?(path)
return path if pid && path == pid && x == $$
- if x == reexec_pid && pid =~ /\.oldbin\z/
+ if x == reexec_pid && pid.end_with?('.oldbin')
logger.warn("will not set pid=#{path} while reexec-ed "\
"child is running PID:#{x}")
return
diff --git a/lib/unicorn/socket_helper.rb b/lib/unicorn/socket_helper.rb
index a321ddf..812ac53 100644
--- a/lib/unicorn/socket_helper.rb
+++ b/lib/unicorn/socket_helper.rb
@@ -156,7 +156,7 @@ module Unicorn
# returns rfc2732-style (e.g. "[::1]:666") addresses for IPv6
def tcp_name(sock)
port, addr = Socket.unpack_sockaddr_in(sock.getsockname)
- /:/ =~ addr ? "[#{addr}]:#{port}" : "#{addr}:#{port}"
+ addr.include?(':') ? "[#{addr}]:#{port}" : "#{addr}:#{port}"
end
module_function :tcp_name
--
EW
reply other threads:[~2015-04-07 7:56 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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://yhbt.net/unicorn/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1428393375-22083-1-git-send-email-e@80x24.org \
--to=e@80x24.org \
--cc=unicorn-public@bogomips.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://yhbt.net/unicorn.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).