From: Eric Wong <normalperson-rMlxZR9MS24@public.gmane.org>
To: rainbows-talk-GrnCvJ7WPxnNLxjTenLetw@public.gmane.org
Subject: [RFC/PATCH] event_machine: lazily set async env keys
Date: Thu, 15 Jul 2010 06:03:38 +0000 [thread overview]
Message-ID: <20100715060338.GA2561@dcvr.yhbt.net> (raw)
This has the small likelyhood of breaking apps that
check via:
env.include?("async.callback")
Or any of member?/has_key?/key?, as they're all the same method.
>From all the async examples I see, I just see apps just
use env["async.callback"].
Worth it?
>From 40ef059dfc99c7daad1b1829713727b86c8fc9a0 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson-rMlxZR9MS24@public.gmane.org>
Date: Thu, 15 Jul 2010 05:48:29 +0000
Subject: [PATCH] event_machine: lazily set async env keys
This is a micro-optimization when running a 'hello world' benchmark and
also reduces the strength of a memory leak under 1.9.2-rc2:
http://redmine.ruby-lang.org/issues/show/3466
---
lib/rainbows/ev_core.rb | 1 -
lib/rainbows/event_machine.rb | 17 ++++++++++++-----
lib/rainbows/rev/client.rb | 1 +
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/lib/rainbows/ev_core.rb b/lib/rainbows/ev_core.rb
index 5ca693b..357042b 100644
--- a/lib/rainbows/ev_core.rb
+++ b/lib/rainbows/ev_core.rb
@@ -16,7 +16,6 @@ module Rainbows
def post_init
@remote_addr = Rainbows.addr(@_io)
- @env = {}
@hp = HttpParser.new
@state = :headers # [ :body [ :trailers ] ] :app_call :close
@buf = ""
diff --git a/lib/rainbows/event_machine.rb b/lib/rainbows/event_machine.rb
index 173340e..14da118 100644
--- a/lib/rainbows/event_machine.rb
+++ b/lib/rainbows/event_machine.rb
@@ -54,6 +54,17 @@ module Rainbows
G = Rainbows::G
def initialize(io)
+ @env = Hash.new do |hash,key|
+ case key
+ when ASYNC_CALLBACK
+ hash[ASYNC_CALLBACK] = method(:em_write_response)
+ when ASYNC_CLOSE
+ # we're not sure if anybody uses this, but Thin sets it, too
+ hash[ASYNC_CLOSE] = EM::DefaultDeferrable.new
+ else
+ nil
+ end
+ end
@_io = io
@body = nil
end
@@ -71,10 +82,6 @@ module Rainbows
begin
@env[RACK_INPUT] = @input
@env[REMOTE_ADDR] = @remote_addr
- @env[ASYNC_CALLBACK] = method(:em_write_response)
-
- # we're not sure if anybody uses this, but Thin sets it, too
- @env[ASYNC_CLOSE] = EM::DefaultDeferrable.new
response = catch(:async) { APP.call(@env.update(RACK_DEFAULTS)) }
@@ -143,7 +150,7 @@ module Rainbows
end
def unbind
- async_close = @env[ASYNC_CLOSE] and async_close.succeed
+ @env.include?(ASYNC_CLOSE) and @env[ASYNC_CLOSE].succeed
@body.respond_to?(:fail) and @body.fail
@_io.close
end
diff --git a/lib/rainbows/rev/client.rb b/lib/rainbows/rev/client.rb
index d08992b..0df7415 100644
--- a/lib/rainbows/rev/client.rb
+++ b/lib/rainbows/rev/client.rb
@@ -15,6 +15,7 @@ module Rainbows
CONN[self] = false
super(io)
post_init
+ @env = {}
@deferred_bodies = [] # for (fast) regular files only
end
--
Eric Wong
_______________________________________________
Rainbows! mailing list - rainbows-talk-GrnCvJ7WPxnNLxjTenLetw@public.gmane.org
http://rubyforge.org/mailman/listinfo/rainbows-talk
Do not quote signatures (like this one) or top post when replying
next reply other threads:[~2010-07-15 6:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-15 6:03 Eric Wong [this message]
[not found] ` <20100715060338.GA2561-yBiyF41qdooeIZ0/mPfg9Q@public.gmane.org>
2010-07-15 14:22 ` [RFC/PATCH] event_machine: lazily set async env keys James Tucker
[not found] ` <DC95175B-4AD7-452C-9F81-F87F922B9A85-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2010-07-15 21:05 ` Eric Wong
[not found] ` <20100715210530.GA30751-yBiyF41qdooeIZ0/mPfg9Q@public.gmane.org>
2010-07-15 21:43 ` James Tucker
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://yhbt.net/rainbows/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100715060338.GA2561@dcvr.yhbt.net \
--to=normalperson-rmlxzr9ms24@public.gmane.org \
--cc=rainbows-talk-GrnCvJ7WPxnNLxjTenLetw@public.gmane.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
http://yhbt.net/rainbows.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).