diff options
author | Eric Wong <normalperson@yhbt.net> | 2010-07-06 09:58:40 +0000 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2010-07-06 10:05:13 +0000 |
commit | d2f240d7ea11738ba889668a669ffb7845d06e7b (patch) | |
tree | 020802df1f92f750ee91f0834c09bac0e304c3a2 /lib | |
parent | 0283928fca45a012b31662b30b49990dac2aae18 (diff) | |
download | rainbows-d2f240d7ea11738ba889668a669ffb7845d06e7b.tar.gz |
Fortunately this only affects the hardly-used FiberSpawn and FiberPool concurrency models, and also unreleased revisions of Rev. 1.9 encoding is tricky to handle right when doing I/O in Ruby...
Diffstat (limited to 'lib')
-rw-r--r-- | lib/rainbows.rb | 1 | ||||
-rw-r--r-- | lib/rainbows/byte_slice.rb | 16 | ||||
-rw-r--r-- | lib/rainbows/fiber/io.rb | 5 | ||||
-rw-r--r-- | lib/rainbows/rev/client.rb | 3 |
4 files changed, 22 insertions, 3 deletions
diff --git a/lib/rainbows.rb b/lib/rainbows.rb index 906806f..b1ec220 100644 --- a/lib/rainbows.rb +++ b/lib/rainbows.rb @@ -122,4 +122,5 @@ module Rainbows end # :startdoc: autoload :Fiber, 'rainbows/fiber' # core class + autoload :ByteSlice, 'rainbows/byte_slice' end diff --git a/lib/rainbows/byte_slice.rb b/lib/rainbows/byte_slice.rb new file mode 100644 index 0000000..09d1188 --- /dev/null +++ b/lib/rainbows/byte_slice.rb @@ -0,0 +1,16 @@ +# -*- encoding: binary -*- +module Rainbows::ByteSlice + if String.method_defined?(:encoding) + def byte_slice(buf, range) + if buf.encoding != Encoding::BINARY + buf.dup.force_encoding(Encoding::BINARY).slice!(range) + else + buf[range] + end + end + else + def byte_slice(buf, range) + buf[range] + end + end +end diff --git a/lib/rainbows/fiber/io.rb b/lib/rainbows/fiber/io.rb index d4f2512..f6b8bdf 100644 --- a/lib/rainbows/fiber/io.rb +++ b/lib/rainbows/fiber/io.rb @@ -7,6 +7,7 @@ module Rainbows # interface that yields away from the current Fiber whenever # the underlying IO object cannot read or write class IO < Struct.new(:to_io, :f) + include Rainbows::ByteSlice # :stopdoc: LOCALHOST = Unicorn::HttpRequest::LOCALHOST @@ -58,8 +59,8 @@ module Rainbows def write(buf) begin - (w = to_io.write_nonblock(buf)) == buf.size and return - buf = buf[w..-1] + (w = to_io.write_nonblock(buf)) == buf.bytesize and return + buf = byte_slice(buf, w..-1) rescue Errno::EAGAIN wait_writable retry diff --git a/lib/rainbows/rev/client.rb b/lib/rainbows/rev/client.rb index f854a63..bc8d7fa 100644 --- a/lib/rainbows/rev/client.rb +++ b/lib/rainbows/rev/client.rb @@ -4,6 +4,7 @@ module Rainbows module Rev class Client < ::Rev::IO + include Rainbows::ByteSlice include Rainbows::EvCore include Rainbows::HttpResponse G = Rainbows::G @@ -33,7 +34,7 @@ module Rainbows end # we never care for the return value, but yes, we may return # a "fake" short write from super(buf) if anybody cares. - buf = buf[w..-1] + buf = byte_slice(buf, w..-1) rescue Errno::EAGAIN break # fall through to super(buf) rescue |