nio4r 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfaa168a1d757e1242d427f89189e39f424039c30fe6a384194166ae7a6e6694
-  data.tar.gz: fe2f130edf1d7963672302b21210a18d915583d096c1721b65e8ec9dc702b5ce
+  metadata.gz: f8796c2f2ce109bc99fe6fab1010bebdb8715cfbfbc31ca0aabbce1d9e56acd4
+  data.tar.gz: 15ff6b62bfa43c5d730c22961e7ab2c4232f4b060cb1632ca5ff649b108dd99e
 SHA512:
-  metadata.gz: 0a195646b2139336075368785eeb77e2de30f700c0845cd14696572685dcfeded9e023761414ed01485e0d617ce96790c6e97cc810bfb95ed600e44cf467ac55
-  data.tar.gz: fa758ef58d38dbe41c44936998d00830e9058b1daef51fe30f551b15ed2148121d5c536dfee8c2ac9c8f064000b8df170b30cb5f87fbc7c4cb6348bd92d3ec15
+  metadata.gz: 17d0b1f7c63515a6ce68b1451a682dd0e4b4a4b3fc5fb8709b368bc90733c9fa5f54da3f8178500b16f6a28c08bfb85fca2fe4a4c61b12fd3a93713f73ae964a
+  data.tar.gz: 904c80947418c7ef90405f9e392993de05666801882ba7ddaab190d86b8f76606c769f763a1da9a7b23f649499bb2ae5578f0717b40927d33fe39d7987b68714

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: ruby
 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
   name: bundler