nio4r 0.4.0 → 0.4.1

data/CHANGES.md

@@ -1,3 +1,7 @@
+0.4.1
+-----
+* Thread synchronization when closing selectors
+
 0.4.0
 -----
 * OpenSSL::SSL::SSLSocket support

data/README.md

@@ -1,6 +1,6 @@
 New IO for Ruby
 ===============
-[![Build Status](http://travis-ci.org/tarcieri/nio4r.png)](http://travis-ci.org/tarcieri/nio4r)
+[![Build Status](https://secure.travis-ci.org/tarcieri/nio4r.png?branch=master)](http://travis-ci.org/tarcieri/nio4r)
 
 When it comes to managing many IO objects on Ruby, there aren't a whole lot of
 options. The most powerful API Ruby itself gives you is Kernel.select, and

data/ext/nio4r/selector.c

@@ -36,6 +36,8 @@ static VALUE NIO_Selector_unlock(VALUE lock);
 static VALUE NIO_Selector_register_synchronized(VALUE *args);
 static VALUE NIO_Selector_deregister_synchronized(VALUE *args);
 static VALUE NIO_Selector_select_synchronized(VALUE *args);
+static VALUE NIO_Selector_close_synchronized(VALUE self);
+
 static int NIO_Selector_run(struct NIO_Selector *selector, VALUE timeout);
 static void NIO_Selector_timeout_callback(struct ev_loop *ev_loop, struct ev_timer *timer, int revents);
 static void NIO_Selector_wakeup_callback(struct ev_loop *ev_loop, struct ev_io *io, int revents);
@@ -389,7 +391,11 @@ static VALUE NIO_Selector_close(VALUE self)
 /* Is the selector closed? */
 static VALUE NIO_Selector_closed(VALUE self)
 {
-    struct NIO_Selector *selector;
+    return NIO_Selector_synchronize(self, NIO_Selector_close_synchronized, self);
+}
+
+static VALUE NIO_Selector_close_synchronized(VALUE self)
+{    struct NIO_Selector *selector;
     Data_Get_Struct(self, struct NIO_Selector, selector);
 
     return selector->closed ? Qtrue : Qfalse;

data/lib/nio/version.rb

@@ -1,3 +1,3 @@
 module NIO
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/nio.rb

@@ -1,4 +1,5 @@
 require 'thread'
+require 'socket'
 require 'nio/version'
 
 # New I/O for Ruby
@@ -19,9 +20,10 @@ else
 
   if defined?(JRUBY_VERSION)
     require 'java'
+    require 'jruby'
     org.nio4r.Nio4r.new.load(JRuby.runtime, false)
     NIO::ENGINE = 'java'
   else
     NIO::ENGINE = 'libev'
   end
-end
+end

data/nio4r.gemspec

@@ -14,7 +14,13 @@ Gem::Specification.new do |gem|
   gem.name          = "nio4r"
   gem.require_paths = ["lib"]
   gem.version       = NIO::VERSION
-  gem.extensions    = ["ext/nio4r/extconf.rb"]
+
+  if defined? JRUBY_VERSION
+    gem.files << "lib/nio4r_ext.jar"
+    gem.platform = "java"
+  else
+    gem.extensions = ["ext/nio4r/extconf.rb"]
+  end
 
   gem.add_development_dependency "rake-compiler"
   gem.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nio4r
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70312140700780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70312140700780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70312140700220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70312140700220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70312140699800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70312140699800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: New IO for Ruby
 email:
 - tony.arcieri@gmail.com
@@ -111,15 +126,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2154301521891928871
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2154301521891928871
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: NIO provides a high performance selector API for monitoring IO objects