Merge pull request #53 from MagLev/johnnyt/recursive-lock-fix

Limit lock scope to prevent recursive locking

lib/nio/selector.rb

@@ -48,6 +48,8 @@ def registered?(io)
 
     # Select which monitors are ready
     def select(timeout = nil)
+      selected_monitors = Set.new
+
       @lock.synchronize do
         readers = [@wakeup]
         writers = []
@@ -61,7 +63,6 @@ def select(timeout = nil)
         ready_readers, ready_writers = Kernel.select readers, writers, [], timeout
         return unless ready_readers # timeout or wakeup
 
-        selected_monitors = Set.new
 
         ready_readers.each do |io|
           if io == @wakeup
@@ -81,15 +82,15 @@ def select(timeout = nil)
           monitor.readiness = (monitor.readiness == :r) ? :rw : :w
           selected_monitors << monitor
         end
+      end
 
-        if block_given?
-          selected_monitors.each do |m|
-            yield m
-          end
-          selected_monitors.size
-        else
-          selected_monitors
+      if block_given?
+        selected_monitors.each do |m|
+          yield m
         end
+        selected_monitors.size
+      else
+        selected_monitors
       end
     end