rage-iodine 1.7.58 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a8e82101c414c23fd04fa074937225caeabfd308ff923467076f1e79c2b93a3
-  data.tar.gz: 3269bdbde8b4b6d2ff7c6ec6f3902e97267c8847c06252c149c384ba6017b202
+  metadata.gz: a5b5db0d766696d96ae2730a5d954229249dbd982bceba8fb63f184a1da62beb
+  data.tar.gz: 397f34465e987d8f63c253f61ee7e3efd098aa94af63a55eeff81c5c13f5b088
 SHA512:
-  metadata.gz: 587a885ad45527a1b71542bfb4cf90291f317eb3aa1205c0137798cde8144ef8760aaf134deb0c4b1972a8639eefb02b8101ae1376a59368d7dd608b2ef7a38f
-  data.tar.gz: 1f6c4f5c2c72c8a1e2fdb4ab9fc3117c6b23f16ddee9bc84777c192a2290df4db8025de45b3609d521c5b0f3fcab4e0227581476cad90c445ad28bd4cdc54961
+  metadata.gz: 00a9d42202213c7c34292b5d70074d17300736004a5d14df21bf9f1f9b933d3172335e07dbb5617f38c278a1f5073333114622dacd69870f258c65181f638cd4
+  data.tar.gz: bc5d84cf74cd4ee5078452fbd01ac67de8c0d2b7026d71af53136d47e862634fbf25d4910cb7e79280b77dab96bd91e76d92e1de41593e9ed2c11e0d0a2b27fe

data/ext/iodine/fio.c

@@ -4051,18 +4051,17 @@ static int fio_watch__internal(void *uuid_, void *protocol_) {
     goto invalid_uuid;
   }
 
-  // if (!protocol) {
-  //   fio_protocol_s *old_pr = uuid_data(uuid).protocol;
-  //   fio_force_close_in_poll(uuid);
-  //   fio_unlock(&uuid_data(uuid).protocol_lock);
-  //   return 0;
-  // }
-
+  fio_protocol_s *old_pr = uuid_data(uuid).protocol;
   uuid_data(uuid).open = 1;
   uuid_data(uuid).protocol = protocol;
   touchfd(fio_uuid2fd(uuid));
   fio_unlock(&uuid_data(uuid).protocol_lock);
 
+  if (old_pr) {
+    /* close old protocol */
+    fio_defer_push_task(deferred_on_close, (void *)uuid, old_pr);
+  }
+
   fio_poll_add(fio_uuid2fd(uuid));
   return 0;
 

data/ext/iodine/scheduler.c

@@ -29,18 +29,23 @@ typedef struct {
   VALUE block;
 } scheduler_protocol_s;
 
-static void iodine_scheduler_perform(intptr_t uuid, fio_protocol_s *fio_protocol) {
-  scheduler_protocol_s *protocol = (scheduler_protocol_s *)fio_protocol;
-  VALUE block = protocol->block;
 
-  IodineCaller.call(block, call_id);
+static void iodine_scheduler_task_close(intptr_t uuid, fio_protocol_s *fio_protocol) {
+  scheduler_protocol_s *protocol = (scheduler_protocol_s *)fio_protocol;
 
-  IodineStore.remove(block);
+  IodineStore.remove(protocol->block);
   fio_free(protocol);
 
   (void)uuid;
 }
 
+static void iodine_scheduler_task_perform(intptr_t uuid, fio_protocol_s *fio_protocol) {
+  scheduler_protocol_s *protocol = (scheduler_protocol_s *)fio_protocol;
+  IodineCaller.call(protocol->block, call_id);
+
+  (void)uuid;
+}
+
 static VALUE iodine_scheduler_attach(VALUE self, VALUE r_fd, VALUE r_waittype, VALUE r_timeout) {
   Check_Type(r_fd, T_FIXNUM);
   int fd = FIX2INT(r_fd);
@@ -61,25 +66,25 @@ static VALUE iodine_scheduler_attach(VALUE self, VALUE r_fd, VALUE r_waittype, V
 
   if ((waittype & ATTACH_ON_READ_READY_CALLBACK) && (waittype & ATTACH_ON_WRITE_READY_CALLBACK)) {
     *protocol = (scheduler_protocol_s){
-        .p.on_data = iodine_scheduler_perform,
-        .p.on_ready = iodine_scheduler_perform,
-        .p.on_close = noop,
+        .p.on_data = iodine_scheduler_task_perform,
+        .p.on_ready = iodine_scheduler_task_perform,
+        .p.on_close = iodine_scheduler_task_close,
         .p.ping = noop,
         .block = block,
     };
   } else if (waittype & ATTACH_ON_READ_READY_CALLBACK) {
     *protocol = (scheduler_protocol_s){
-        .p.on_data = iodine_scheduler_perform,
+        .p.on_data = iodine_scheduler_task_perform,
         .p.on_ready = noop,
-        .p.on_close = noop,
+        .p.on_close = iodine_scheduler_task_close,
         .p.ping = noop,
         .block = block,
     };
   } else if (waittype & ATTACH_ON_WRITE_READY_CALLBACK) {
     *protocol = (scheduler_protocol_s){
         .p.on_data = noop,
-        .p.on_ready = iodine_scheduler_perform,
-        .p.on_close = noop,
+        .p.on_ready = iodine_scheduler_task_perform,
+        .p.on_close = iodine_scheduler_task_close,
         .p.ping = noop,
         .block = block,
     };

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '1.7.58'.freeze
+  VERSION = '1.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rage-iodine
 version: !ruby/object:Gem::Version
-  version: 1.7.58
+  version: 1.8.0
 platform: ruby
 authors:
 - Boaz Segev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-15 00:00:00.000000000 Z
+date: 2023-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -253,7 +253,7 @@ licenses:
 metadata:
   allowed_push_host: https://rubygems.org
 post_install_message: |-
-  Thank you for installing Iodine 1.7.58.
+  Thank you for installing Iodine 1.8.0.
   Remember: if iodine supports your business, it's only fair to give value back (code contributions / donations).
 rdoc_options: []
 require_paths: