celluloid-io 0.16.0.pre → 0.16.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ef8df712ab13d7a2adca88bc42781b256074996
-  data.tar.gz: edb9143049e62e5484f17ea870539a55af137ec7
+  metadata.gz: d2a7a8f3f757ee68efb8e2b599d2fb5d64ef17df
+  data.tar.gz: 30658a13260ae50f648c61faae35bfb157d84fb2
 SHA512:
-  metadata.gz: f5965bae29ff210224fd7293f22a209e8582bd2c25bc2abbd83753609d473b90b910bc23b965ae5f945851898e113ae06bf31112f6525a3742e1ff3655ac7b40
-  data.tar.gz: 93eee2a93b600f5e5a9851e6678c22049dd5dc2b844440bb68fb6ade354287158e6aeba5e78b136317856ac83b162fe195b65ea2c9da57d56b4f2c2721838b26
+  metadata.gz: 5a49e8683143d29b0ed3647ae1f65ec7c5c30272de50f45476d2e2204bc9b5f91074024939d2cce6971f650f0b029debf0417d01ded1d34e6a85812dd764bc38
+  data.tar.gz: f1f529f48d7c559721ad32a4f857bb35e04041892b021cdbd3578f2a55a87e8ba1ebb7960616b0bb2dc02bf0f24bab5ba40fe8dbc6578b6add2688385f395945

data/.rspec

@@ -1,4 +1,5 @@
---color 
---format documentation 
+--color
+--format documentation
 --backtrace
---default_path spec
+--order random
+--warnings

data/.travis.yml

@@ -2,18 +2,18 @@ script: rake ci
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.1
   - ruby-head
   - jruby
   - jruby-head
-  - rbx
+  - rbx-2
 
 matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby
     - rvm: jruby-head
-    - rvm: rbx
+    - rvm: rbx-2
 
 notifications:
   irc: "irc.freenode.org#celluloid"

data/CHANGES.md

@@ -1,5 +1,7 @@
-HEAD
-----
+0.16.0.pre2 (2014-06-22)
+------------------------
+* Fix bug handling simultaneous read/write interests
+* Use Resolv::DNS::Config to obtain nameservers
 * Celluloid::IO.copy_stream support (uses a background thread)
 
 0.15.0 (2013-09-04)

data/lib/celluloid/io/dns_resolver.rb

@@ -1,11 +1,13 @@
+require 'ipaddr'
 require 'resolv'
 
 module Celluloid
   module IO
     # Asynchronous DNS resolver using Celluloid::IO::UDPSocket
     class DNSResolver
-      RESOLV_CONF = '/etc/resolv.conf'
-      DNS_PORT    = 53
+      # Maximum UDP packet we'll accept
+      MAX_PACKET_SIZE = 512
+      DNS_PORT        = 53
 
       @mutex = Mutex.new
       @identifier = 1
@@ -14,19 +16,18 @@ module Celluloid
         @mutex.synchronize { @identifier = (@identifier + 1) & 0xFFFF }
       end
 
-      def self.nameservers(config = RESOLV_CONF)
-        File.read(config).scan(/^\s*nameserver\s+([0-9.:]+)/).flatten
+      def self.nameservers
+        Resolv::DNS::Config.default_config_hash[:nameserver]
       end
 
       def initialize
         @nameservers = self.class.nameservers
 
-        # TODO: fall back on other nameservers if the first one is unavailable
-        @server = @nameservers.first
+        @server = IPAddr.new(@nameservers.sample)
 
         # The non-blocking secret sauce is here, as this is actually a
         # Celluloid::IO::UDPSocket
-        @socket = UDPSocket.new
+        @socket = UDPSocket.new(@server.family)
       end
 
       def resolve(hostname)
@@ -38,8 +39,8 @@ module Celluloid
         end
 
         query = build_query(hostname)
-        @socket.send query.encode, 0, @server, DNS_PORT
-        data, _ = @socket.recvfrom(512)
+        @socket.send query.encode, 0, @server.to_s, DNS_PORT
+        data, _ = @socket.recvfrom(MAX_PACKET_SIZE)
         response = Resolv::DNS::Message.decode(data)
 
         addrs = []

data/lib/celluloid/io/reactor.rb

@@ -14,20 +14,25 @@ module Celluloid
 
       def initialize
         @selector = NIO::Selector.new
+        @monitors = {}
       end
 
       # Wait for the given IO object to become readable
       def wait_readable(io)
-        wait io, :r
+        wait io do |monitor|
+          monitor.wait_readable
+        end
       end
 
       # Wait for the given IO object to become writable
       def wait_writable(io)
-        wait io, :w
+        wait io do |monitor|
+          monitor.wait_writable
+        end
       end
 
       # Wait for the given IO operation to complete
-      def wait(io, set)
+      def wait(io)
         # zomg ugly type conversion :(
         unless io.is_a?(::IO) or io.is_a?(OpenSSL::SSL::SSLSocket)
           if io.respond_to? :to_io
@@ -39,21 +44,89 @@ module Celluloid
           raise TypeError, "can't convert #{io.class} into IO" unless io.is_a?(::IO)
         end
 
-        monitor = @selector.register(io, set)
-        monitor.value = Task.current
-        Task.suspend :iowait
+        unless monitor = @monitors[io]
+          monitor = Monitor.new(@selector, io)
+          @monitors[io] = monitor
+        end
+
+        yield monitor
       end
 
       # Run the reactor, waiting for events or wakeup signal
       def run_once(timeout = nil)
         @selector.select(timeout) do |monitor|
-          task = monitor.value
-          monitor.close
+          monitor.value.resume
+        end
+      end
+
+      class Monitor
+        def initialize(selector, io)
+          @selector = selector
+          @io = io
+          @interests = {}
+        end
+
+        def wait_readable
+          wait :r
+        end
+
+        def wait_writable
+          wait :w
+        end
+
+        def wait(interest)
+          raise "Already waiting for #{interest.inspect}" if @interests.include?(interest)
+          @interests[interest] = Task.current
+          reregister
+          Task.suspend :iowait
+        end
+
+        def reregister
+          if @monitor
+            @monitor.close
+            @monitor = nil
+          end
+
+          if interests_symbol
+            @monitor = @selector.register(@io, interests_symbol)
+            @monitor.value = self
+          end
+        end
+
+        def interests_symbol
+          case @interests.keys
+          when [:r]
+            :r
+          when [:w]
+            :w
+          when [:r, :w]
+            :rw
+          end
+        end
+
+        def resume
+          raise "No monitor" unless @monitor
+
+          if @monitor.readable?
+            resume_for :r
+          end
+
+          if @monitor.writable?
+            resume_for :w
+          end
+
+          reregister
+        end
+
+        def resume_for(interest)
+          task = @interests.delete(interest)
 
-          if task.running?
-            task.resume
-          else
-            Logger.warn("reactor attempted to resume a dead task")
+          if task
+            if task.running?
+              task.resume
+            else
+              raise "reactor attempted to resume a dead task"
+            end
           end
         end
       end

data/lib/celluloid/io/tcp_socket.rb

@@ -8,7 +8,7 @@ module Celluloid
       extend Forwardable
 
       def_delegators :@socket, :read_nonblock, :write_nonblock, :close, :close_read, :close_write, :closed?
-      def_delegators :@socket, :addr, :peeraddr, :setsockopt
+      def_delegators :@socket, :addr, :peeraddr, :setsockopt, :getsockname
 
       # Open a TCP socket, yielding it to the given block and closing it
       # automatically when done (if a block is given)

data/lib/celluloid/io/version.rb

@@ -1,5 +1,5 @@
 module Celluloid
   module IO
-    VERSION = "0.16.0.pre"
+    VERSION = "0.16.0.pre2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: celluloid-io
 version: !ruby/object:Gem::Version
-  version: 0.16.0.pre
+  version: 0.16.0.pre2
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Celluloid::IO allows you to monitor multiple IO objects within a Celluloid
@@ -206,3 +206,4 @@ test_files:
 - spec/fixtures/server.crt
 - spec/fixtures/server.key
 - spec/spec_helper.rb
+has_rdoc: