nio4r 2.3.0-java → 2.3.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43270fa7bd80de10c62d7cf016d5aaa467826bed8fb9fdde9472781f23f2a5ee
-  data.tar.gz: 7c2707907b7480afaddb9d8eea003f8abbcf506bcb2f953332cfc05c9bb77c00
+  metadata.gz: c88a32f43cf5641855c0e4a43a41b7d39feb95375adc7fd000fd5dde6af7f196
+  data.tar.gz: 002e8e31de2d8684c5a04aa224de9a21ab9f3faeda6aa32e89d3642da2160e89
 SHA512:
-  metadata.gz: 037f13a47f6118849e41ae942421ae209d3a051ba449fb1f251dfbb7f3c79fb0457a25a829bbf21c397daba9092e9242ae04f3c6086e59940f95a91ebd862822
-  data.tar.gz: 437b0feab60bce714c2bb3a6322a0a84ffa9b3ce189feb52928302e67a8020cbf53102894a44744917e804784d018f3f8a6079dc42090cad4dfe476fdf425859
+  metadata.gz: 6479c8cb7074dd20b4b0db25b694dc23c3d5350f6354ee43423035d1f1f8cca69c1f4c3b0ae48e120793c3c3bfac9f92e59d199084653308de183b68741c92a7
+  data.tar.gz: 3b80ae22d65d9699d096475ecd53cfa92f23514c45a7cf0c91391abfc2afbaa3869be67e8b92f2c7138d56b3547b4f688948b39d82dca3381b56fce0b986684d

data/.travis.yml

@@ -13,7 +13,7 @@ branches:
     - master
 
 rvm:
-  - jruby-9.1.15.0 # latest stable
+  - jruby-9.1.17.0 # latest stable
   - 2.2.7
   - 2.3.4
   - 2.4.1

data/CHANGES.md

@@ -1,3 +1,9 @@
+## 2.3.1 (2018-05-03)
+
+* [#188](https://github.com/socketry/nio4r/pull/188)
+  Fix remove interests
+  ([@ioquatix])
+
 ## 2.3.0 (2018-03-15)
 
 * [#183](https://github.com/socketry/nio4r/pull/183)

data/ext/nio4r/monitor.c

@@ -111,7 +111,9 @@ static VALUE NIO_Monitor_initialize(VALUE self, VALUE io, VALUE interests, VALUE
        object where it originally came from */
     monitor->selector = selector;
 
-    ev_io_start(selector->ev_loop, &monitor->ev_io);
+    if (monitor->interests) {
+      ev_io_start(selector->ev_loop, &monitor->ev_io);
+    }
 
     return Qnil;
 }
@@ -127,7 +129,7 @@ static VALUE NIO_Monitor_close(int argc, VALUE *argv, VALUE self)
 
     if(selector != Qnil) {
         /* if ev_loop is 0, it means that the loop has been stopped already (see NIO_Selector_shutdown) */
-        if(monitor->selector->ev_loop != 0) {
+        if(monitor->interests && monitor->selector->ev_loop) {
           ev_io_stop(monitor->selector->ev_loop, &monitor->ev_io);
         }
 
@@ -176,8 +178,8 @@ static VALUE NIO_Monitor_add_interest(VALUE self, VALUE interest) {
     struct NIO_Monitor *monitor;
     Data_Get_Struct(self, struct NIO_Monitor, monitor);
 
-    monitor->interests |= NIO_Monitor_symbol2interest(interest);
-    NIO_Monitor_update_interests(self, monitor->interests);
+    interest = monitor->interests | NIO_Monitor_symbol2interest(interest);
+    NIO_Monitor_update_interests(self, interest);
 
     return rb_ivar_get(self, rb_intern("interests"));
 }
@@ -186,8 +188,8 @@ static VALUE NIO_Monitor_remove_interest(VALUE self, VALUE interest) {
     struct NIO_Monitor *monitor;
     Data_Get_Struct(self, struct NIO_Monitor, monitor);
 
-    monitor->interests &= ~NIO_Monitor_symbol2interest(interest);
-    NIO_Monitor_update_interests(self, monitor->interests);
+    interest = monitor->interests & ~NIO_Monitor_symbol2interest(interest);
+    NIO_Monitor_update_interests(self, interest);
 
     return rb_ivar_get(self, rb_intern("interests"));
 }
@@ -297,10 +299,18 @@ static void NIO_Monitor_update_interests(VALUE self, int interests)
     }
 
     if(monitor->interests != interests) {
-        monitor->interests = interests;
+        // If the monitor currently has interests, we should stop it.
+        if(monitor->interests) {
+            ev_io_stop(monitor->selector->ev_loop, &monitor->ev_io);
+        }
 
-        ev_io_stop(monitor->selector->ev_loop, &monitor->ev_io);
+        // Assign the interests we are now monitoring for:
+        monitor->interests = interests;
         ev_io_set(&monitor->ev_io, monitor->ev_io.fd, monitor->interests);
-        ev_io_start(monitor->selector->ev_loop, &monitor->ev_io);
+
+        // If we are interested in events, schedule the monitor back into the event loop:
+        if(monitor->interests) {
+            ev_io_start(monitor->selector->ev_loop, &monitor->ev_io);
+        }
     }
 }

data/ext/nio4r/selector.c

@@ -552,6 +552,8 @@ void NIO_Selector_monitor_callback(ev_loop *ev_loop, struct ev_io *io, int reven
     struct NIO_Selector *selector = monitor_data->selector;
     VALUE monitor = monitor_data->self;
 
+    assert(monitor_data->interests != 0);
+
     assert(selector != 0);
     selector->ready_count++;
     monitor_data->revents = revents;

data/lib/nio/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NIO
-  VERSION = "2.3.0".freeze
+  VERSION = "2.3.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nio4r
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: java
 authors:
 - Tony Arcieri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement