* [PATCH] epoll: ensure closing of pipelined clients if required
@ 2013-01-24 19:56 Eric Wong
0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2013-01-24 19:56 UTC (permalink / raw)
To: rainbows-talk-GrnCvJ7WPxnNLxjTenLetw
on_read normally relies on the close checking in on_readable,
but on_deferred_write_complete may be called from on_writable
instead (bypassing the close check of on_readable).
This affects both Epoll and XEpoll users, but only if they
were sending responses via body#to_path and triggering
on_deferred_write_complete.
While we're at it, favor non-recursive want_more instead of
calling on_readable recursively in ev_write_responses to
prevent stack growth.
---
commit 49f70632e2f4a9b84fd4fced7439d0844fed1bbd in "master"
of git://bogomips.org/rainbows.git
lib/rainbows/epoll/client.rb | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/lib/rainbows/epoll/client.rb b/lib/rainbows/epoll/client.rb
index f690d85..d72696b 100644
--- a/lib/rainbows/epoll/client.rb
+++ b/lib/rainbows/epoll/client.rb
@@ -102,7 +102,19 @@ module Rainbows::Epoll::Client
else
write_response(status, headers, body, alive)
end
- on_read(Z) if alive && 0 == @wr_queue.size && 0 != @buf.size
+ # try to read more if we didn't have to buffer writes
+ next_request if alive && 0 == @wr_queue.size
+ end
+
+ def next_request
+ if 0 == @buf.size
+ want_more
+ else
+ # pipelined request (already in buffer)
+ on_read(Z)
+ return if @wr_queue[0] || closed?
+ close if :close == @state
+ end
end
def epoll_run
@@ -120,7 +132,7 @@ module Rainbows::Epoll::Client
def on_deferred_write_complete
:close == @state and return close
- 0 == @buf.size ? on_readable : on_read(Z)
+ next_request
end
def handle_error(e)
--
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-01-24 19:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-01-24 19:56 [PATCH] epoll: ensure closing of pipelined clients if required Eric Wong
Code repositories for project(s) associated with this public inbox
https://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).