nio4r 0.2.1-java → 0.2.2-java

data/CHANGES.md

@@ -1,3 +1,7 @@
+0.2.2
+-----
+* Raise IOError if asked to wake up a closed selector
+
 0.2.1
 -----
 * Implement wakeup mechanism using raw pipes instead of ev_async, since

data/ext/nio4r/selector.c

@@ -406,6 +406,10 @@ static VALUE NIO_Selector_wakeup(VALUE self)
     struct NIO_Selector *selector;
     Data_Get_Struct(self, struct NIO_Selector, selector);
 
+    if(selector->closed) {
+        rb_raise(rb_eIOError, "selector is closed");
+    }
+
     write(selector->wakeup_writer, "\0", 1);
 
     return Qnil;

data/lib/nio/jruby/selector.rb

@@ -118,6 +118,7 @@ module NIO
 
     # Wake up the other thread that's currently blocking on this selector
     def wakeup
+      raise IOError, "selector is closed" if closed?
       @java_selector.wakeup
       nil
     end

data/lib/nio/selector.rb

@@ -98,7 +98,12 @@ module NIO
       selected.size
     end
 
-    # Wake up other threads waiting on this selector
+    # Wake up a thread that's in the middle of selecting on this selector, if
+    # any such thread exists.
+    #
+    # Invoking this method more than once between two successive select calls
+    # has the same effect as invoking it just once. In other words, it provides
+    # level-triggered behavior.
     def wakeup
       # Send the selector a signal in the form of writing data to a pipe
       @waker << "\0"

data/lib/nio/version.rb

@@ -1,3 +1,3 @@
 module NIO
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/nio4r.gemspec

@@ -15,8 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = NIO::VERSION
 #  gem.extensions    = ["ext/nio4r/extconf.rb"]
-  gem.platform      = 'java'
-
+  gem.platform = 'java'
   gem.add_development_dependency "rake-compiler", "~> 0.7.9"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec", "~> 2.7.0"

data/spec/nio/selector_spec.rb

@@ -30,25 +30,25 @@ describe NIO::Selector do
     monitor.should be_closed
   end
 
-  context "select" do
-    it "waits for a timeout when selecting" do
-      reader, writer = IO.pipe
-      monitor = subject.register(reader, :r)
-
-      payload = "hi there"
-      writer << payload
-
-      timeout = 0.5
-      started_at = Time.now
-      subject.select(timeout).should include monitor
-      (Time.now - started_at).should be_within(TIMEOUT_PRECISION).of(0)
-      reader.read_nonblock(payload.size)
-
-      started_at = Time.now
-      subject.select(timeout).should be_nil
-      (Time.now - started_at).should be_within(TIMEOUT_PRECISION).of(timeout)
-    end
+  it "waits for a timeout when selecting" do
+    reader, writer = IO.pipe
+    monitor = subject.register(reader, :r)
+
+    payload = "hi there"
+    writer << payload
 
+    timeout = 0.5
+    started_at = Time.now
+    subject.select(timeout).should include monitor
+    (Time.now - started_at).should be_within(TIMEOUT_PRECISION).of(0)
+    reader.read_nonblock(payload.size)
+
+    started_at = Time.now
+    subject.select(timeout).should be_nil
+    (Time.now - started_at).should be_within(TIMEOUT_PRECISION).of(timeout)
+  end
+
+  context "wakeup" do
     it "wakes up if signaled to from another thread" do
       pipe, _ = IO.pipe
       subject.register(pipe, :r)
@@ -65,6 +65,13 @@ describe NIO::Selector do
 
       thread.value.should be_within(TIMEOUT_PRECISION).of(timeout)
     end
+
+    it "raises IOError if asked to wake up a closed selector" do
+      subject.close
+      subject.should be_closed
+
+      expect { subject.wakeup }.to raise_exception IOError
+    end
   end
 
   context "select_each" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nio4r
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: java
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70225282552520 !ruby/object:Gem::Requirement
+  requirement: &70302856516460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.9
   type: :development
   prerelease: false
-  version_requirements: *70225282552520
+  version_requirements: *70302856516460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70225282551940 !ruby/object:Gem::Requirement
+  requirement: &70302856515580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70225282551940
+  version_requirements: *70302856515580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70225282551240 !ruby/object:Gem::Requirement
+  requirement: &70302856514260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70225282551240
+  version_requirements: *70302856514260
 description: New IO for Ruby
 email:
 - tony.arcieri@gmail.com