Use Celluloid::IO.wait_readable for all servers/sockets

celluloid · Apr 4, 2013 · c28e5a2 · c28e5a2
1 parent 015fa7d
commit c28e5a2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 25 deletions.
diff --git a/lib/celluloid/io/tcp_server.rb b/lib/celluloid/io/tcp_server.rb
@@ -12,18 +12,12 @@ def initialize(hostname, port)
       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

diff --git a/lib/celluloid/io/udp_socket.rb b/lib/celluloid/io/udp_socket.rb
@@ -16,13 +16,7 @@ def evented?
       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

diff --git a/lib/celluloid/io/unix_server.rb b/lib/celluloid/io/unix_server.rb
@@ -16,18 +16,12 @@ def initialize(socket_path)
       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