cool.io 1.9.1 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d38b3958d9ad5505fb4a53ded526d2ab347d46200a567a9aa0681cc5ca487cc
-  data.tar.gz: 42cb1b75db2c409dfc48756b8df29663675e31a104d03c37bbbfce9344592d6d
+  metadata.gz: 744af9f4092900f46b6db222fadf805f4fe107fb8f3c5c0a5c9661508d957ac5
+  data.tar.gz: 594ae4eb024a1c4519ec912859126b5e739f52cc3bdfab1f93ae8fc9cbf7610f
 SHA512:
-  metadata.gz: 6e3358de317e34735ca0f264c75f93d34d38325482c02eabf4d1289b3c44ef6557918bd59078a34c809322d69d05299ccb58f89db630c4054dc0162de8ab49b6
-  data.tar.gz: 775568343fe8788adbc43757a6f06ef5474e1d19477571317f29e21ff3da777d8567a6401377c6eb854e9f0c4060d97da7c84dafa56dc1e772f636417365d338
+  metadata.gz: 5b27d1af86f5647d9409b7b394d5ed9f2c85de9b68ab88d1d6363ca94aa05d84326f4feed754319f8409b371c53c61cb814292f7849618d806235b7e6de65007
+  data.tar.gz: 58839f3800e0aa902f4c0b60b7b23eff2414cb1c34a14df688b318e4b1d31151ce7dfcc6a8e9d7b1d818d5160cf858b0a8a533ee5d1adf1c195d00baa7f50d43

data/.github/workflows/test.yaml

@@ -5,9 +5,6 @@ on: [push, pull_request]
 permissions:
   contents: read
 
-env:
-  CONSOLE_OUTPUT: XTerm
-
 jobs:
   test:
     name: ${{matrix.ruby}} on ${{matrix.os}}
@@ -15,40 +12,31 @@ jobs:
     continue-on-error: ${{matrix.experimental}}
     
     strategy:
-      fail-fast: false
       matrix:
         os:
           - ubuntu
           - macos
-          - windows
         
         ruby:
-          - "3.0"
-          - "3.1"
           - "3.2"
           - "3.3"
-          - "head"
+          - "3.4"
+          - "4.0"
         
         experimental: [false]
         
-        # include:
-        #   - os: ubuntu
-        #     ruby: truffleruby
-        #     experimental: true
-        #   - os: ubuntu
-        #     ruby: jruby
-        #     experimental: true
-        #   - os: ubuntu
-        #     ruby: head
-        #     experimental: true
+        include:
+          - os: ubuntu
+            ruby: head
+            experimental: true
     
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v6
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{matrix.ruby}}
         bundler-cache: true
     
     - name: Run tests
-      timeout-minutes: 2
+      timeout-minutes: 10
       run: bundle exec rake

data/ext/cool.io/buffer.c

@@ -479,7 +479,7 @@ buffer_free(struct buffer * buf)
     buffer_clear(buf);
     buffer_free_pool(buf);
 
-    free(buf);
+    xfree(buf);
 }
 
 /* Free the memory pool */
@@ -491,7 +491,7 @@ buffer_free_pool(struct buffer * buf)
     while (buf->pool_head) {
         tmp = buf->pool_head;
         buf->pool_head = tmp->next;
-        free(tmp);
+        xfree(tmp);
     }
 
     buf->pool_tail = 0;

data/ext/cool.io/loop.c

@@ -113,6 +113,12 @@ void Coolio_Loop_process_event(VALUE watcher, int revents)
   /* The Global VM lock isn't held right now, but hopefully
    * we can still do this safely */
   watcher_data = Coolio_Watcher_ptr(watcher);
+
+  if (watcher_data->enabled == 0) {
+    /* Ignore event because watcher was already detached. */
+    return;
+  }
+
   loop_data = Coolio_Loop_ptr(watcher_data->loop);
 
   /*  Well, what better place to explain how this all works than

data/ext/cool.io/watcher.h

@@ -33,6 +33,10 @@
   if(watcher_data->loop == Qnil) \
     rb_raise(rb_eRuntimeError, "not attached to a loop"); \
   \
+  if (watcher_data->enabled == 0) { \
+    /* Ignore because watcher was already detached. */ \
+    return Qnil; \
+  } \
   loop_data = Coolio_Loop_ptr(watcher_data->loop); \
   \
   ev_##watcher_type##_stop(loop_data->ev_loop, &watcher_data->event_types.ev_##watcher_type); \

data/lib/cool.io/version.rb

@@ -1,5 +1,5 @@
 module Coolio
-  VERSION = "1.9.1"
+  VERSION = "1.9.3"
   
   def self.version
     VERSION

data/spec/detach_race_condition_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe Cool.io::Loop do
+  class Victim < Cool.io::IOWatcher
+    def initialize(io)
+      super
+      @io = io
+    end
+
+    def on_readable
+      begin
+        @io.read_nonblock(1024)
+      rescue IO::WaitReadable, EOFError
+      end
+    end
+  end
+
+  # https://github.com/socketry/cool.io/issues/87
+  it "does not raise TypeError when a watcher is detached while an event is pending" do
+    loop = Cool.io::Loop.default
+
+    iterations = 200
+
+    expect {
+      iterations.times do
+        r_victim, w_victim = IO.pipe
+        victim_watcher = Victim.new(r_victim)
+        victim_watcher.attach(loop)
+
+        t1 = Thread.new do
+          sleep 0.01
+          w_victim.write("dummy\n")
+        end
+
+        t2 = Thread.new do
+          sleep 0.01
+          victim_watcher.detach
+        end
+
+        loop.run_once
+
+        t1.join
+        t2.join
+
+        r_victim.close
+        w_victim.close
+      end
+    }.not_to raise_error
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cool.io
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.3
 platform: ruby
 authors:
 - Tony Arcieri
@@ -140,6 +140,7 @@ files:
 - libev_ruby_gil.diff
 - libev_win_select.diff
 - spec/async_watcher_spec.rb
+- spec/detach_race_condition_spec.rb
 - spec/dns_spec.rb
 - spec/iobuffer_spec.rb
 - spec/spec_helper.rb
@@ -168,11 +169,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.0.dev
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A cool framework for doing high performance I/O in Ruby
 test_files:
 - spec/async_watcher_spec.rb
+- spec/detach_race_condition_spec.rb
 - spec/dns_spec.rb
 - spec/iobuffer_spec.rb
 - spec/spec_helper.rb