nio4r 0.4.2-java → 0.4.3-java

data/CHANGES.md

@@ -1,3 +1,7 @@
+0.4.3
+-----
+* REALLY have thread synchronization when closing selectors ;)
+
 0.4.2
 -----
 * Attempt to work around packaging problems with bundler-api o_O

data/ext/nio4r/selector.c

@@ -37,6 +37,7 @@ 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 VALUE NIO_Selector_closed_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);
@@ -117,11 +118,6 @@ static void NIO_Selector_mark(struct NIO_Selector *selector)
    Called by both NIO::Selector#close and the finalizer below */
 static void NIO_Selector_shutdown(struct NIO_Selector *selector)
 {
-    if(selector->ev_loop) {
-        ev_loop_destroy(selector->ev_loop);
-        selector->ev_loop = 0;
-    }
-
     if(selector->closed) {
         return;
     }
@@ -129,6 +125,10 @@ static void NIO_Selector_shutdown(struct NIO_Selector *selector)
     close(selector->wakeup_reader);
     close(selector->wakeup_writer);
 
+    if(selector->ev_loop) {
+        ev_loop_destroy(selector->ev_loop);
+        selector->ev_loop = 0;
+    }
     selector->closed = 1;
 }
 
@@ -379,6 +379,11 @@ static VALUE NIO_Selector_wakeup(VALUE self)
 
 /* Close the selector and free system resources */
 static VALUE NIO_Selector_close(VALUE self)
+{
+    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);
@@ -391,10 +396,10 @@ static VALUE NIO_Selector_close(VALUE self)
 /* Is the selector closed? */
 static VALUE NIO_Selector_closed(VALUE self)
 {
-    return NIO_Selector_synchronize(self, NIO_Selector_close_synchronized, self);
+    return NIO_Selector_synchronize(self, NIO_Selector_closed_synchronized, self);
 }
 
-static VALUE NIO_Selector_close_synchronized(VALUE self)
+static VALUE NIO_Selector_closed_synchronized(VALUE self)
 {    struct NIO_Selector *selector;
     Data_Get_Struct(self, struct NIO_Selector, selector);
 
@@ -405,7 +410,7 @@ static VALUE NIO_Selector_close_synchronized(VALUE self)
 static VALUE NIO_Selector_is_empty(VALUE self)
 {
     VALUE selectables = rb_ivar_get(self, rb_intern("selectables"));
-    
+
     return rb_funcall(selectables, rb_intern("empty?"), 0) == Qtrue ? Qtrue : Qfalse;
 }
 

data/lib/nio/version.rb

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

data/spec/nio/acceptables_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe "NIO acceptables" do
   shared_context "an NIO acceptable" do
     let(:selector) { NIO::Selector.new }

metadata

@@ -2,14 +2,14 @@
 name: nio4r
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.4.2
+  version: 0.4.3
 platform: java
 authors:
 - Tony Arcieri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler