nio4r 0.4.3-java → 0.4.4-java

data/CHANGES.md

@@ -1,3 +1,7 @@
+0.4.4
+-----
+* Fix return values for Selector_synchronize and Selector_unlock
+
 0.4.3
 -----
 * REALLY have thread synchronization when closing selectors ;)

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source "https://rubygems.org"
 
 gem 'jruby-openssl' if defined? JRUBY_VERSION
 

data/README.md

@@ -121,7 +121,7 @@ selector.deregister(reader)
 
 Monitors provide methods which let you introspect on why a particular IO
 object was selected. These methods are not thread safe unless you are holding
-the selector lock (i.e. if you're in a block pased to #select). Only use them
+the selector lock (i.e. if you're in a block passed to #select). Only use them
 if you aren't concerned with thread safety, or you're within a #select
 block:
 

data/ext/nio4r/org/nio4r/Nio4r.java

@@ -231,7 +231,7 @@ public class Nio4r implements Library {
         @JRubyMethod
         public synchronized IRubyObject select(ThreadContext context, IRubyObject timeout, Block block) {
             Ruby runtime = context.getRuntime();
-            int ready = doSelect(runtime, timeout);
+            int ready = doSelect(runtime, context, timeout);
 
             /* Timeout or wakeup */
             if(ready <= 0)
@@ -263,21 +263,26 @@ public class Nio4r implements Library {
         }
 
         /* Run the selector */
-        private int doSelect(Ruby runtime, IRubyObject timeout) {
+        private int doSelect(Ruby runtime, ThreadContext context, IRubyObject timeout) {
+            int result;
+
             cancelKeys();
             try {
+                context.getThread().beforeBlockingCall();
                 if(timeout.isNil()) {
-                    return this.selector.select();
+                    result = this.selector.select();
                 } else {
                     double t = RubyNumeric.num2dbl(timeout);
                     if(t == 0) {
-                        return this.selector.selectNow();
+                        result = this.selector.selectNow();
                     } else if(t < 0) {
                         throw runtime.newArgumentError("time interval must be positive");
                     } else {
-                        return this.selector.select((long)(t * 1000));
+                        result = this.selector.select((long)(t * 1000));
                     }
                 }
+                context.getThread().afterBlockingCall();
+                return result;
             } catch(IOException ie) {
                 throw runtime.newIOError(ie.getLocalizedMessage());
             }

data/ext/nio4r/selector.c

@@ -170,7 +170,7 @@ static VALUE NIO_Selector_synchronize(VALUE self, VALUE (*func)(VALUE *args), VA
         return rb_ensure(func, (VALUE)args, NIO_Selector_unlock, self);
     } else {
         /* We already hold the selector lock, so no need to unlock it */
-        func(args);
+        return func(args);
     }
 }
 
@@ -183,6 +183,8 @@ static VALUE NIO_Selector_unlock(VALUE self)
 
     lock = rb_ivar_get(self, rb_intern("lock"));
     rb_funcall(lock, rb_intern("unlock"), 0, 0);
+
+    return Qnil;
 }
 
 /* Register an IO object with the selector for the given interests */

data/lib/nio.rb

@@ -11,7 +11,7 @@ module NIO
   def self.engine; ENGINE end
 end
 
-if ENV["NIO4R_PURE"]
+if ENV["NIO4R_PURE"] || ENV["OS"] =~ /Windows/i
   require 'nio/monitor'
   require 'nio/selector'
   NIO::ENGINE = 'select'

data/lib/nio/selector.rb

@@ -18,7 +18,9 @@ module NIO
     # * :rw - is the IO either readable or writeable?
     def register(io, interest)
       @lock.synchronize do
-        raise ArgumentError, "this IO is already registered with the selector" if @selectables[io]
+        if monitor = @selectables[io]
+          raise ArgumentError, "this IO is already registered with the selector as #{monitor.interests.inspect}"
+        end
 
         monitor = Monitor.new(io, interest, self)
         @selectables[io] = monitor
@@ -61,14 +63,7 @@ module NIO
           if io == @wakeup
             # Clear all wakeup signals we've received by reading them
             # Wakeups should have level triggered behavior
-            begin
-              @wakeup.read_nonblock(1024)
-
-              # Loop until we've drained all incoming events
-              redo
-            rescue Errno::EWOULDBLOCK
-            end
-
+            @wakeup.read(@wakeup.stat.size)
             return
           else
             monitor = @selectables[io]
@@ -107,7 +102,7 @@ module NIO
     # level-triggered behavior.
     def wakeup
       # Send the selector a signal in the form of writing data to a pipe
-      @waker << "\0"
+      @waker.write "\0"
       nil
     end
 

data/lib/nio/version.rb

@@ -1,3 +1,3 @@
 module NIO
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/spec/nio/monitor_spec.rb

@@ -6,12 +6,12 @@ describe NIO::Monitor do
   let(:writer) { pipes.last }
   let(:selector) { NIO::Selector.new }
 
-  subject    { selector.register(reader, :rw) }
+  subject    { selector.register(reader, :r) }
   let(:peer) { selector.register(writer, :rw) }
   after      { selector.close }
 
   it "knows its interests" do
-    subject.interests.should == :rw
+    subject.interests.should == :r
     peer.interests.should == :rw
   end
 

data/spec/nio/selectables/pipe_spec.rb

@@ -18,8 +18,13 @@ describe "IO.pipe" do
   let :unwritable_subject do
     reader, pipe = IO.pipe
 
+    #HACK: On OS X 10.8, this str must be larger than PIPE_BUF. Otherwise,
+    #      the write is atomic and select() will return writable but write()
+    #      will throw EAGAIN if there is too little space to write the string
+    # TODO: Use FFI to lookup the platform-specific size of PIPE_BUF
+    str = "JUNK IN THE TUBES" * 10000
     begin
-      pipe.write_nonblock "JUNK IN THE TUBES"
+      pipe.write_nonblock str
       _, writers = select [], [pipe], [], 0
     rescue Errno::EPIPE
       break

data/spec/nio/selector_spec.rb

@@ -114,13 +114,25 @@ describe NIO::Selector do
       writer << "ohai"
       unready, _ = IO.pipe
 
-      reader_monitor   = subject.register(reader, :r)
+      reader_monitor  = subject.register(reader, :r)
       unready_monitor = subject.register(unready, :r)
 
       selected = subject.select(0)
       selected.size.should == 1
-      selected.should include(reader_monitor)
-      selected.should_not include(unready_monitor)
+      selected.should include reader_monitor
+      selected.should_not include unready_monitor
+    end
+
+    it "selects closed IO objects" do
+      monitor = subject.register(reader, :r)
+      subject.select(0).should be_nil
+
+      thread = Thread.new { subject.select }
+      Thread.pass while thread.status && thread.status != "sleep"
+
+      writer.close
+      selected = thread.value
+      selected.should include monitor
     end
 
     it "iterates across selected objects with a block" do
@@ -140,9 +152,9 @@ describe NIO::Selector do
       result = subject.select { |monitor| readables << monitor }
       result.should == 2
 
-      readables.should include(monitor1)
-      readables.should include(monitor2)
-      readables.should_not include(monitor3)
+      readables.should include monitor1
+      readables.should include monitor2
+      readables.should_not include monitor3
     end
   end
 

metadata

@@ -1,28 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: nio4r
 version: !ruby/object:Gem::Version
+  version: 0.4.4
   prerelease:
-  version: 0.4.3
 platform: java
 authors:
 - Tony Arcieri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2013-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: !binary |-
           MA==
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: !binary |-
           MA==
@@ -33,14 +33,14 @@ dependencies:
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: !binary |-
           MA==
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: !binary |-
           MA==
@@ -51,14 +51,14 @@ dependencies:
   name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: !binary |-
           MA==
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: !binary |-
           MA==
@@ -72,9 +72,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
@@ -128,21 +128,15 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2
       version: !binary |-
         MA==
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2
       version: !binary |-
         MA==
   none: false