From: Eric Wong <e@80x24.org>
To: unicorn-public@bogomips.org
Cc: e@80x24.org
Subject: [PATCH 2/2] avoid extra allocation for hijack proc creation
Date: Sat, 16 May 2015 21:30:25 +0000 [thread overview]
Message-ID: <1431811825-20664-3-git-send-email-e@80x24.org> (raw)
In-Reply-To: <1431811825-20664-1-git-send-email-e@80x24.org>
proc creation is expensive, so merely use a 48-byte generic ivar
hash slot for @socket instead.
---
lib/unicorn/http_request.rb | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/lib/unicorn/http_request.rb b/lib/unicorn/http_request.rb
index b32003e..b60e383 100644
--- a/lib/unicorn/http_request.rb
+++ b/lib/unicorn/http_request.rb
@@ -97,15 +97,21 @@ class Unicorn::HttpParser
e[RACK_INPUT] = 0 == content_length ?
NULL_IO : @@input_class.new(socket, self)
- hijack_setup(e, socket)
+
+ # for Rack hijacking in Rack 1.5 and later
+ @socket = socket
+ e[RACK_HIJACK] = self
+
e.merge!(DEFAULTS)
end
- def hijacked?
- env.include?(RACK_HIJACK_IO)
+ # for rack.hijack, we respond to this method so no extra allocation
+ # of a proc object
+ def call
+ env[RACK_HIJACK_IO] = @socket
end
- def hijack_setup(e, socket)
- e[RACK_HIJACK] = proc { e[RACK_HIJACK_IO] = socket }
+ def hijacked?
+ env.include?(RACK_HIJACK_IO)
end
end
--
EW
prev parent reply other threads:[~2015-05-16 21:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-16 21:30 [PATCH 0/2] no avoiding rack.hijack anymore Eric Wong
2015-05-16 21:30 ` [PATCH 1/2] http_request: support rack.hijack by default Eric Wong
2015-05-19 20:01 ` [PATCH] http_response: avoid special-casing for Rack < 1.5 Eric Wong
2015-05-16 21:30 ` 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://yhbt.net/unicorn/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1431811825-20664-3-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).