* [PATCH] oob_gc: rely on opt_aref_with optimization on Ruby 2.2+
@ 2017-03-08 5:01 6% Eric Wong
0 siblings, 0 replies; 4+ results
From: Eric Wong @ 2017-03-08 5:01 UTC (permalink / raw)
To: unicorn-public
Maybe oob_gc probably isn't heavily used anymore, maybe
some Ruby 2.2+ users will benefit from this constant
reduction.
Followup-to: fb2f10e1d7a72e67 ("reduce constants and optimize for Ruby 2.2")
---
lib/unicorn/oob_gc.rb | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/unicorn/oob_gc.rb b/lib/unicorn/oob_gc.rb
index 5572e59..c4741a0 100644
--- a/lib/unicorn/oob_gc.rb
+++ b/lib/unicorn/oob_gc.rb
@@ -66,10 +66,9 @@ def self.new(app, interval = 5, path = %r{\A/})
end
#:stopdoc:
- PATH_INFO = "PATH_INFO"
def process_client(client)
super(client) # Unicorn::HttpServer#process_client
- if OOBGC_PATH =~ OOBGC_ENV[PATH_INFO] && ((@@nr -= 1) <= 0)
+ if OOBGC_PATH =~ OOBGC_ENV['PATH_INFO'] && ((@@nr -= 1) <= 0)
@@nr = OOBGC_INTERVAL
OOBGC_ENV.clear
disabled = GC.enable
--
EW
^ permalink raw reply related [relevance 6%]
* [ANN] unicorn 5.0.0.pre2 - another prerelease!
@ 2015-07-06 21:41 7% ` Eric Wong
0 siblings, 0 replies; 4+ results
From: Eric Wong @ 2015-07-06 21:41 UTC (permalink / raw)
To: unicorn-public
There is a minor TCP socket options are now applied to inherited
sockets, and we have native support for inheriting sockets from
systemd (by emulating the sd_listen_fds(3) function).
Dynamic changes in the application to Rack::Utils::HTTP_STATUS
codes is now supported, so you can use your own custom status
lines.
Ruby 2.2 and later is now favored for performance.
Optimizations by using constants which made sense in earlier
versions of Ruby are gone: so users of old Ruby versions
will see performance regressions. Ruby 2.2 users should
see the same or better performance, and we have less code
as a result.
* doc: update some invalid URLs
* apply TCP socket options on inherited sockets
* reflect changes in Rack::Utils::HTTP_STATUS_CODES
* reduce constants and optimize for Ruby 2.2
* http_response: reduce size of multi-line header path
* emulate sd_listen_fds for systemd support
* test/unit/test_response.rb: compatibility with older test-unit
This also includes all changes in unicorn 5.0.0.pre1:
http://bogomips.org/unicorn-public/m/20150615225652.GA16164@dcvr.yhbt.net.html
--
EW
^ permalink raw reply [relevance 7%]
* [PATCH 2/3] reduce constants and optimize for Ruby 2.2
2015-06-30 22:51 5% [PATCH 0/3] reflect changes to Rack::Utils::HTTP_STATUS_CODES Eric Wong
@ 2015-06-30 22:51 6% ` Eric Wong
0 siblings, 0 replies; 4+ results
From: Eric Wong @ 2015-06-30 22:51 UTC (permalink / raw)
To: unicorn-public; +Cc: e
Ruby (MRI) 2.1 optimizes allocations away on String#freeze with
literal strings.
Furthermore, Ruby 2.2 optimizes away literal string allocations
when they are used as arguments to Hash#[] and Hash#[]=
Thus we can avoid expensive constant lookups and cache overhead
by taking advantage of advancements in Ruby.
Since Ruby 2.2 has been out for 7 months, now; it ought to be safe
to introduce minor performance regressions for folks using older
Rubies (1.9.3+ remains supported) to benefit folks on the latest
Ruby.
This should recover the performance lost in the
"reflect changes in Rack::Utils::HTTP_STATUS_CODES" change
in synthetic benchmarks.
---
lib/unicorn/http_request.rb | 19 +++++++------------
lib/unicorn/http_response.rb | 6 ++----
2 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/lib/unicorn/http_request.rb b/lib/unicorn/http_request.rb
index 9339bce..0c1f9bb 100644
--- a/lib/unicorn/http_request.rb
+++ b/lib/unicorn/http_request.rb
@@ -21,17 +21,12 @@ class Unicorn::HttpParser
"SERVER_SOFTWARE" => "Unicorn #{Unicorn::Const::UNICORN_VERSION}"
}
- RACK_HIJACK = "rack.hijack".freeze
- RACK_HIJACK_IO = "rack.hijack_io".freeze
NULL_IO = StringIO.new("")
# :stopdoc:
# A frozen format for this is about 15% faster
# Drop these frozen strings when Ruby 2.2 becomes more prevalent,
# 2.2+ optimizes hash assignments when used with literal string keys
- REMOTE_ADDR = 'REMOTE_ADDR'.freeze
- RACK_INPUT = 'rack.input'.freeze
- UNICORN_SOCKET = 'unicorn.socket'.freeze
HTTP_RESPONSE_START = [ 'HTTP', '/1.1 ']
@@input_class = Unicorn::TeeInput
@@check_client_connection = false
@@ -78,7 +73,7 @@ class Unicorn::HttpParser
# identify the client for the immediate request to the server;
# that client may be a proxy, gateway, or other intermediary
# acting on behalf of the actual source client."
- e[REMOTE_ADDR] = socket.kgio_addr
+ e['REMOTE_ADDR'] = socket.kgio_addr
# short circuit the common case with small GET requests first
socket.kgio_read!(16384, buf)
@@ -94,12 +89,12 @@ class Unicorn::HttpParser
HTTP_RESPONSE_START.each { |c| socket.write(c) }
end
- e[RACK_INPUT] = 0 == content_length ?
- NULL_IO : @@input_class.new(socket, self)
+ e['rack.input'] = 0 == content_length ?
+ NULL_IO : @@input_class.new(socket, self)
# for Rack hijacking in Rack 1.5 and later
- e[UNICORN_SOCKET] = socket
- e[RACK_HIJACK] = self
+ e['unicorn.socket'] = socket
+ e['rack.hijack'] = self
e.merge!(DEFAULTS)
end
@@ -107,10 +102,10 @@ class Unicorn::HttpParser
# for rack.hijack, we respond to this method so no extra allocation
# of a proc object
def call
- env[RACK_HIJACK_IO] = env[UNICORN_SOCKET]
+ env['rack.hijack_io'] = env['unicorn.socket']
end
def hijacked?
- env.include?(RACK_HIJACK_IO)
+ env.include?('rack.hijack_io'.freeze)
end
end
diff --git a/lib/unicorn/http_response.rb b/lib/unicorn/http_response.rb
index a42303e..ec8b7c8 100644
--- a/lib/unicorn/http_response.rb
+++ b/lib/unicorn/http_response.rb
@@ -10,8 +10,6 @@
# is the job of Rack, with the exception of the "Date" and "Status" header.
module Unicorn::HttpResponse
- CRLF = "\r\n"
-
# internal API, code will always be common-enough-for-even-old-Rack
def err_response(code, response_start_sent)
"#{response_start_sent ? '' : 'HTTP/1.1 '}" \
@@ -39,7 +37,7 @@ module Unicorn::HttpResponse
# key in Rack < 1.5
hijack = value
else
- if value =~ /\n/
+ if value.include?("\n".freeze)
# avoiding blank, key-only cookies with /\n+/
buf << value.split(/\n+/).map! { |v| "#{key}: #{v}\r\n" }.join
else
@@ -47,7 +45,7 @@ module Unicorn::HttpResponse
end
end
end
- socket.write(buf << CRLF)
+ socket.write(buf << "\r\n".freeze)
end
if hijack
--
EW
^ permalink raw reply related [relevance 6%]
* [PATCH 0/3] reflect changes to Rack::Utils::HTTP_STATUS_CODES
@ 2015-06-30 22:51 5% Eric Wong
2015-06-30 22:51 6% ` [PATCH 2/3] reduce constants and optimize for Ruby 2.2 Eric Wong
0 siblings, 1 reply; 4+ results
From: Eric Wong @ 2015-06-30 22:51 UTC (permalink / raw)
To: unicorn-public; +Cc: e
A user privately reported (to unicorn@bogomips.org) that they wanted
status text reflected in their responses for an HTTP status code not
included with Rack::Utils::HTTP_STATUS_CODES.
They tried to modify Rack::Utils::HTTP_STATUS_CODES hash directly in
their app, but unicorn loads before their app and already memoized the
status codes internally in the CODES hash to reduce GC pressure, thus
their change was never reflected.
With the first change, users can change Rack::Utils::HTTP_STATUS_CODES
as many times as they want (perhaps even based on time-of-day, weather,
server load, whatever) and the changes will be reflected
instantaneously in responses.
Of course, this slows unicorn down slightly due to increased GC
pressure, but I doubt anybody would notice in Real World usage.
In case they do, patch 2/3 will recover the lost performance
if they're using Ruby 2.2+
I figure anybody who cares about micro-benchmark performance with
unicorn would be using the latest Rubies anyways...
That user is Bcc:-ed for these patches, and can follow any public
discussion at: http://bogomips.org/unicorn-public/
(including the Atom feed at http://bogomips.org/unicorn-public/atom.xml )
* [PATCH 1/3] reflect changes in Rack::Utils::HTTP_STATUS_CODES
introduces a performance regression
* [PATCH 2/3] reduce constants and optimize for Ruby 2.2
recover lost performance from [PATCH 1/3] (on Ruby 2.2+),
further regressions for 2.1+
* [PATCH 3/3] http_response: reduce size of multi-line header path
bonus reduce code size for common cases, should
lib/unicorn/http_request.rb | 19 +++++++------------
lib/unicorn/http_response.rb | 23 ++++++++++-------------
test/unit/test_response.rb | 20 ++++++++++++++++++++
3 files changed, 37 insertions(+), 25 deletions(-)
^ permalink raw reply [relevance 5%]
Results 1-4 of 4 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2015-06-15 22:56 [ANN] unicorn 5.0.0.pre1 - incompatible changes! Eric Wong
2015-07-06 21:41 7% ` [ANN] unicorn 5.0.0.pre2 - another prerelease! Eric Wong
2015-06-30 22:51 5% [PATCH 0/3] reflect changes to Rack::Utils::HTTP_STATUS_CODES Eric Wong
2015-06-30 22:51 6% ` [PATCH 2/3] reduce constants and optimize for Ruby 2.2 Eric Wong
2017-03-08 5:01 6% [PATCH] oob_gc: rely on opt_aref_with optimization on Ruby 2.2+ Eric Wong
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).