cool.io 1.9.2 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cdd11354b2fc68835f7380b7f529a5c41c29280dd489287eb99fbc605978f18
-  data.tar.gz: 51e173aadc18fdd12915648b7ac58553ab0b22c13be146e2273d507135cefe58
+  metadata.gz: f15a89de41069e6ccb37eb28befd01d601851ae1bb9ee2a5081e1c26e0bcc8da
+  data.tar.gz: de69fe197c029bbb4438e2e1c751580712ecc1f1b8326803d2089b738d3f74cc
 SHA512:
-  metadata.gz: 4449d8f0cec3c081e3ff3625351d66e1eb19ec4cdc23d547a4c2862d0b3a25e8a71bf43eb803559b3758ed284bd3f4a4f5e6008b04e490530604c6cc6551a9eb
-  data.tar.gz: 7607bab107f686eb8f1a16bc013f0a78815238fc1063de51d75b3e6299f00384583bd311de2841ea1d5bd43e4b72eaad5b43f3f22face9bd327ca9c0629f1a0f
+  metadata.gz: c88454501a2b042515b0571a729bac9a829ed7af72be377caf5ab6db08f90bb48adb1e19a69dee1b38eb1c77df9c084c88faa19d0077503c85a965e6c0c556ac
+  data.tar.gz: 8fd2af4f085bbb253df79cb8c9c685df97c5dc233f4be4891cef796120e9b265676e6fa4fe7c39b0b3b77447c000e41cbb1bc66b8939869e8747ac270619c436

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}}
@@ -20,35 +17,27 @@ jobs:
         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/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.2"
+  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.2
+  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: