celluloid-io 0.13.0 → 0.13.1

data/CHANGES.md

@@ -1,3 +1,8 @@
+0.13.1 (2013-04-04)
+-------------------
+* Fix major performance regression: I/O backpressure (i.e. EAGAIN
+  handling) was being double-dispatched through the actor protocol.
+
 0.13.0
 ------
 * Support for many, many more IO methods, particularly line-oriented

data/Gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'coveralls', require: false
-gem 'celluloid', github: 'celluloid/celluloid'
+gem 'celluloid', github: 'celluloid/celluloid', branch: '0-13-stable'

data/lib/celluloid/io.rb

@@ -1,4 +1,3 @@
-require 'forwardable'
 require 'celluloid/io/version'
 
 require 'celluloid'
@@ -24,9 +23,28 @@ module Celluloid
       klass.mailbox_class Celluloid::IO::Mailbox
     end
 
-    extend Forwardable
+    def wait_readable(io)
+      io = io.to_io
+      actor = Thread.current[:celluloid_actor]
+      if actor && actor.mailbox.is_a?(Celluloid::IO::Mailbox)
+        actor.mailbox.reactor.wait_readable(io)
+      else
+        Kernel.select([io])
+      end
+      nil
+    end
+    module_function :wait_readable
 
-    # Wait for the given IO object to become readable/writable
-    def_delegators 'current_actor.mailbox.reactor', :wait_readable, :wait_writable
+    def wait_writable(io)
+      io = io.to_io
+      actor = Thread.current[:celluloid_actor]
+      if actor && actor.mailbox.is_a?(Celluloid::IO::Mailbox)
+        actor.mailbox.reactor.wait_writable(io)
+      else
+        Kernel.select([], [io])
+      end
+      nil
+    end
+    module_function :wait_writable
   end
 end

data/lib/celluloid/io/stream.rb

@@ -36,22 +36,10 @@ module Celluloid
       end
 
       # Wait until the current object is readable
-      def wait_readable
-        if evented?
-          Celluloid.current_actor.wait_readable(self.to_io)
-        else
-          Kernel.select([self.to_io])
-        end
-      end
+      def wait_readable; Celluloid::IO.wait_readable(self); end
 
       # Wait until the current object is writable
-      def wait_writable
-        if evented?
-          Celluloid.current_actor.wait_writable(self.to_io)
-        else
-          Kernel.select([], [self.to_io])
-        end
-      end
+      def wait_writable; Celluloid::IO.wait_writable(self); end
 
       # System read via the nonblocking subsystem
       def sysread(length = nil, buffer = nil)

data/lib/celluloid/io/tcp_server.rb

@@ -12,18 +12,12 @@ module Celluloid
       end
 
       def accept
-        actor = Thread.current[:celluloid_actor]
-
-        if evented?
-          Celluloid.current_actor.wait_readable @server
-          accept_nonblock
-        else
-          Celluloid::IO::TCPSocket.from_ruby_socket @server.accept
-        end
+        Celluloid::IO.wait_readable(@server)
+        accept_nonblock
       end
 
       def accept_nonblock
-        Celluloid::IO::TCPSocket.from_ruby_socket @server.accept_nonblock
+        Celluloid::IO::TCPSocket.new(@server.accept_nonblock)
       end
 
       def to_io

data/lib/celluloid/io/udp_socket.rb

@@ -16,13 +16,7 @@ module Celluloid
       end
 
       # Wait until the socket is readable
-      def wait_readable
-        if evented?
-          Celluloid.current_actor.wait_readable(@socket)
-        else
-          Kernel.select([@socket])
-        end
-      end
+      def wait_readable; Celluloid::IO.wait_readable(self); end
 
       # Receives up to maxlen bytes from socket. flags is zero or more of the
       # MSG_ options. The first element of the results, mesg, is the data

data/lib/celluloid/io/unix_server.rb

@@ -16,18 +16,12 @@ module Celluloid
       end
 
       def accept
-        actor = Thread.current[:celluloid_actor]
-
-        if evented?
-          Celluloid.current_actor.wait_readable @server
-          accept_nonblock
-        else
-          Celluloid::IO::UNIXSocket.from_ruby_socket @server.accept
-        end
+        Celluloid::IO.wait_readable(@server)
+        accept_nonblock
       end
 
       def accept_nonblock
-        Celluloid::IO::UNIXSocket.from_ruby_socket @server.accept_nonblock
+        Celluloid::IO::UNIXSocket.new(@server.accept_nonblock)
       end
 
       def to_io

data/lib/celluloid/io/version.rb

@@ -1,5 +1,5 @@
 module Celluloid
   module IO
-    VERSION = "0.13.0"
+    VERSION = "0.13.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: celluloid-io
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid