From e21939d776673b2f8887adf7a5c64812b7d2e98e Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 30 Dec 2010 08:33:15 +0000 Subject: globally refactor Range handling for responses Rack::Utils::HeaderHash is still very expensive in Rack 1.2, especially for simple things that we want to run as fast as possible with minimal interference. HeaderHash is unnecessary for most requests that do not send Content-Range in responses. --- lib/rainbows/revactor/client/methods.rb | 45 +++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 lib/rainbows/revactor/client/methods.rb (limited to 'lib/rainbows/revactor/client/methods.rb') diff --git a/lib/rainbows/revactor/client/methods.rb b/lib/rainbows/revactor/client/methods.rb new file mode 100644 index 0000000..e9b39a3 --- /dev/null +++ b/lib/rainbows/revactor/client/methods.rb @@ -0,0 +1,45 @@ +# -*- encoding: binary -*- +# :enddoc: +module Rainbows::Revactor::Client::Methods + if IO.method_defined?(:sendfile_nonblock) + def write_body_file(body, range) + body, client = body_to_io(body), @client + sock = @client.instance_variable_get(:@_io) + pfx = Revactor::TCP::Socket === client ? :tcp : :unix + write_complete = T[:"#{pfx}_write_complete", client] + closed = T[:"#{pfx}_closed", client] + offset, count = range ? range : [ 0, body.stat.size ] + begin + offset += (n = sock.sendfile_nonblock(body, offset, count)) + rescue Errno::EAGAIN + # The @_write_buffer is empty at this point, trigger the + # on_readable method which in turn triggers on_write_complete + # even though nothing was written + client.controller = Actor.current + client.__send__(:enable_write_watcher) + Actor.receive do |filter| + filter.when(write_complete) {} + filter.when(closed) { raise Errno::EPIPE } + end + retry + rescue EOFError + break + end while (count -= n) > 0 + ensure + close_if_private(body) + end + end + + def handle_error(e) + Revactor::TCP::ReadError === e or super + end + + def write_response(status, headers, body, alive) + super(status, headers, body, alive) + alive && @ts and @hp.buf << @ts.leftover + end + + def self.included(klass) + klass.__send__ :alias_method, :write_body_stream, :write_body_each + end +end -- cgit v1.2.3-24-ge0c7