diff options
Diffstat (limited to 'lib/rainbows/fiber/body.rb')
| -rw-r--r-- | lib/rainbows/fiber/body.rb | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/lib/rainbows/fiber/body.rb b/lib/rainbows/fiber/body.rb index 1d7d325..872b1df 100644 --- a/lib/rainbows/fiber/body.rb +++ b/lib/rainbows/fiber/body.rb @@ -5,20 +5,15 @@ # this is meant to be included _after_ Rainbows::Response::Body module Rainbows::Fiber::Body # :nodoc: - # TODO non-blocking splice(2) under Linux - ALIASES = { - :write_body_stream => :write_body_each - } - # the sendfile 1.0.0+ gem includes IO#sendfile_nonblock if IO.method_defined?(:sendfile_nonblock) - def write_body_file_sendfile_fiber(client, body, range) - sock, n, body = client.to_io, nil, body_to_io(body) + def write_body_file(body, range) + sock, n, body = to_io, nil, body_to_io(body) offset, count = range ? range : [ 0, body.stat.size ] begin offset += (n = sock.sendfile_nonblock(body, offset, count)) rescue Errno::EAGAIN - client.kgio_wait_writable + kgio_wait_writable retry rescue EOFError break @@ -26,14 +21,9 @@ module Rainbows::Fiber::Body # :nodoc: ensure close_if_private(body) end - ALIASES[:write_body_file] = :write_body_file_sendfile_fiber - else - ALIASES[:write_body] = :write_body_each end def self.included(klass) - ALIASES.each do |new_method, orig_method| - klass.__send__(:alias_method, new_method, orig_method) - end + klass.__send__ :alias_method, :write_body_stream, :write_body_each end end |