cool.io 1.9.3 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 744af9f4092900f46b6db222fadf805f4fe107fb8f3c5c0a5c9661508d957ac5
-  data.tar.gz: 594ae4eb024a1c4519ec912859126b5e739f52cc3bdfab1f93ae8fc9cbf7610f
+  metadata.gz: f15a89de41069e6ccb37eb28befd01d601851ae1bb9ee2a5081e1c26e0bcc8da
+  data.tar.gz: de69fe197c029bbb4438e2e1c751580712ecc1f1b8326803d2089b738d3f74cc
 SHA512:
-  metadata.gz: 5b27d1af86f5647d9409b7b394d5ed9f2c85de9b68ab88d1d6363ca94aa05d84326f4feed754319f8409b371c53c61cb814292f7849618d806235b7e6de65007
-  data.tar.gz: 58839f3800e0aa902f4c0b60b7b23eff2414cb1c34a14df688b318e4b1d31151ce7dfcc6a8e9d7b1d818d5160cf858b0a8a533ee5d1adf1c195d00baa7f50d43
+  metadata.gz: c88454501a2b042515b0571a729bac9a829ed7af72be377caf5ab6db08f90bb48adb1e19a69dee1b38eb1c77df9c084c88faa19d0077503c85a965e6c0c556ac
+  data.tar.gz: 8fd2af4f085bbb253df79cb8c9c685df97c5dc233f4be4891cef796120e9b265676e6fa4fe7c39b0b3b77447c000e41cbb1bc66b8939869e8747ac270619c436

data/.github/workflows/test.yaml

@@ -12,6 +12,7 @@ jobs:
     continue-on-error: ${{matrix.experimental}}
     
     strategy:
+      fail-fast: false
       matrix:
         os:
           - ubuntu

data/ext/cool.io/watcher.h

@@ -26,20 +26,15 @@
 
 #define Watcher_Detach(watcher_type, watcher) \
   struct Coolio_Watcher *watcher_data; \
-  struct Coolio_Loop *loop_data; \
   \
   watcher_data = Coolio_Watcher_ptr(watcher); \
   \
   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; \
+  if (watcher_data->enabled) { \
+    rb_funcall(watcher, rb_intern("disable"), 0); \
   } \
-  loop_data = Coolio_Loop_ptr(watcher_data->loop); \
-  \
-  ev_##watcher_type##_stop(loop_data->ev_loop, &watcher_data->event_types.ev_##watcher_type); \
   rb_call_super(0, 0)
 
 #define Watcher_Enable(watcher_type, watcher) \
@@ -66,10 +61,10 @@
   if(watcher_data->loop == Qnil) \
     rb_raise(rb_eRuntimeError, "not attached to a loop"); \
   \
-  rb_call_super(0, 0); \
-  \
-  loop_data = Coolio_Loop_ptr(watcher_data->loop); \
-  \
-  ev_##watcher_type##_stop(loop_data->ev_loop, &watcher_data->event_types.ev_##watcher_type)
+  if (watcher_data->enabled) { \
+    loop_data = Coolio_Loop_ptr(watcher_data->loop); \
+    ev_##watcher_type##_stop(loop_data->ev_loop, &watcher_data->event_types.ev_##watcher_type); \
+  } \
+  rb_call_super(0, 0);
 
 #endif

data/lib/cool.io/version.rb

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

data/spec/detach_race_condition_spec.rb

@@ -47,4 +47,49 @@ describe Cool.io::Loop do
       end
     }.not_to raise_error
   end
+
+  class HttpHandler < Coolio::IO
+    RESPONSE = "HTTP/1.1 200 OK\r\nContent-Length: 1024\r\nConnection: close\r\n\r\n" + ("X" * 1024)
+
+    def on_connect
+    end
+
+    def on_read(data)
+      write(RESPONSE)
+    end
+
+    def on_write_complete
+      close
+    end
+  end
+
+  # https://github.com/socketry/cool.io/issues/89
+  it "does not cause memory leaks" do
+    port = 18989
+    loop = Coolio::Loop.default
+
+    server = Coolio::TCPServer.new('127.0.0.1', port, HttpHandler)
+    server.attach(loop)
+
+    event_thread = Thread.new { loop.run }
+
+    request = "GET / HTTP/1.1\r\nHost: localhost\r\n\r\n"
+
+    10.times do |iteration|
+      begin
+        sock = TCPSocket.new('127.0.0.1', port)
+        sock.write(request)
+        sock.read
+        sock.close
+      rescue => e
+        sleep 0.01
+        retry
+      end
+    end
+
+    server.close
+    event_thread.join
+
+    expect(loop.watchers).to be_empty
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cool.io
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.9.4
 platform: ruby
 authors:
 - Tony Arcieri
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: A cool framework for doing high performance I/O in Ruby
 test_files: