rage-iodine 3.3.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1cf5cbcae299e1e28aaca04e99ea7ab9204a4d98fbf9434b27620f7588c22bc
-  data.tar.gz: 634a243fc8abdff8bfa59e21cf4e2a95a356e309569d17e85568cd5c2803d38f
+  metadata.gz: 4262f702902096226a678e94c8b73acf61798fb5441c8cfbb04a831cbea7a738
+  data.tar.gz: fdede223e570118defae54723fe52744cc01548e1c0c71d303dfc4760448d76a
 SHA512:
-  metadata.gz: e25730fe3ce0166e0e7ad4e260a1a1d15787cc264c906fce21a6a960614c3d5d033cbb597bb54cb36a97c316f8f64c5bd079e2c4d3f4cf5b6f0de1d890d92f27
-  data.tar.gz: fa94545855b466b9a16f00dbb267161b0cad66c546d973aa589bd74500868381c349e6d8df5d18c983fa3ecb4fd69fa5f21e57dbedc0f69c833c809c1eb4dc8f
+  metadata.gz: 2cf0070ab89370aa02970d80d920ac5b498172e5dfc2ef78b460a1d2d131886ef033a16f96107b3510f4b1652622e133942dcd16d438adead001962bcba54111
+  data.tar.gz: 85a2937799e604dbd0079668b5432bd785b3550d7e3e5dd94bae41f0b0c7b58ed68c036aad6cbcb79dadaddfb6534a31c0f0b34e34bfb5773c8dbfab84a0656d

data/CHANGELOG.md

@@ -6,6 +6,16 @@ Please notice that this change log contains changes for upcoming releases as wel
 
 ## Changes:
 
+#### Change log v.4.1.0 (2025-02-07)
+
+**Update**: Correctly handle `0` timeouts.
+
+#### Change log v.4.0.0 (2024-09-11)
+
+**Update**: Stop disconnecting from the DB on fork.
+
+**Update**: Fiber Scheduler updates to correctly close file descriptors.
+
 #### Change log v.3.3.0 (2024-08-18)
 
 **Update**: Improvements and fixes for the static file service.

data/ext/iodine/fio.c

@@ -363,6 +363,8 @@ typedef struct {
   uint8_t open;
   /** indicated that the connection should be closed. */
   uint8_t close;
+  /** indicates whether the fd is coming from the Fiber Scheduler. */
+  uint8_t internal;
   /** peer address length */
   uint8_t addr_len;
   /** peer address */
@@ -2075,7 +2077,7 @@ static size_t fio_poll(void) {
         epoll_wait(internal[j].data.fd, events, FIO_POLL_MAX_EVENTS, 0);
     if (active_count > 0) {
       for (int i = 0; i < active_count; i++) {
-        if (events[i].events & (~(EPOLLIN | EPOLLOUT | EPOLLHUP | EPOLLRDHUP))) {
+        if (events[i].events & (~(EPOLLIN | EPOLLOUT | EPOLLHUP | EPOLLRDHUP | EPOLLERR))) {
           // errors are hendled as disconnections (on_close)
           fio_force_close_in_poll(fd2uuid(events[i].data.fd));
         } else {
@@ -2088,9 +2090,12 @@ static size_t fio_poll(void) {
             fio_defer_push_task(deferred_on_data,
                                 (void *)fd2uuid(events[i].data.fd), NULL);
           }
-          if (events[i].events & (EPOLLHUP | EPOLLRDHUP)) {
-            fio_defer_push_task(deferred_force_close_in_poll,
-                                (void *)fd2uuid(events[i].data.fd), NULL);
+          if (events[i].events & (EPOLLHUP | EPOLLRDHUP | EPOLLERR)) {
+            if(fd_data(events[i].data.fd).internal) {
+              fio_force_close_in_poll(fd2uuid(events[i].data.fd));
+            } else {
+              fio_clear_fd((intptr_t)events[i].data.fd, 0);
+            }
           }
         }
       } // end for loop
@@ -2226,8 +2231,11 @@ static size_t fio_poll(void) {
                             NULL);
       }
       if (events[i].flags & (EV_EOF | EV_ERROR)) {
-        fio_defer_push_task(deferred_force_close_in_poll,
-                            (void *)fd2uuid(events[i].udata), NULL);
+        if(fd_data(events[i].udata).internal) {
+          fio_force_close_in_poll(fd2uuid(events[i].udata));
+        } else {
+          fio_clear_fd((intptr_t)events[i].udata, 0);
+        }
       }
     }
   } else if (active_count < 0) {
@@ -4033,6 +4041,7 @@ static int fio_attach__internal(void *uuid_, void *protocol_) {
   }
   fio_protocol_s *old_pr = uuid_data(uuid).protocol;
   uuid_data(uuid).open = 1;
+  uuid_data(uuid).internal = 1;
   uuid_data(uuid).protocol = protocol;
   touchfd(fio_uuid2fd(uuid));
   fio_unlock(&uuid_data(uuid).protocol_lock);
@@ -4093,6 +4102,7 @@ static int fio_watch__internal(void *uuid_, void *protocol_) {
 
   fio_protocol_s *old_pr = uuid_data(uuid).protocol;
   uuid_data(uuid).open = 1;
+  uuid_data(uuid).internal = 0;
   uuid_data(uuid).protocol = protocol;
   touchfd(fio_uuid2fd(uuid));
   fio_unlock(&uuid_data(uuid).protocol_lock);

data/ext/iodine/scheduler.c

@@ -15,7 +15,9 @@
 static ID call_id;
 static uint8_t ATTACH_ON_READ_READY_CALLBACK;
 static uint8_t ATTACH_ON_WRITE_READY_CALLBACK;
-static VALUE timeout_args[1];
+static VALUE e_timeout_args[1];
+static VALUE e_closed_args[1];
+static VALUE e_not_ready_args[1];
 
 /* *****************************************************************************
 Fiber Scheduler API
@@ -36,6 +38,10 @@ typedef struct {
 static void iodine_scheduler_task_close(intptr_t uuid, fio_protocol_s *fio_protocol) {
   scheduler_protocol_s *protocol = (scheduler_protocol_s *)fio_protocol;
 
+  if (!protocol->fulfilled) {
+    IodineCaller.call2(protocol->block, call_id, 1, e_closed_args);
+  }
+
   IodineStore.remove(protocol->block);
   fio_free(protocol);
 
@@ -53,11 +59,30 @@ static void iodine_scheduler_task_perform(intptr_t uuid, fio_protocol_s *fio_pro
   (void)uuid;
 }
 
+static void iodine_scheduler_task_not_ready(void *uuid, void *fio_protocol) {
+  scheduler_protocol_s *protocol = (scheduler_protocol_s *)fio_protocol;
+
+  if (!protocol->fulfilled) {
+    IodineCaller.call2(protocol->block, call_id, 1, e_not_ready_args);
+    protocol->fulfilled = 1;
+  }
+
+  (void)uuid;
+}
+
+static void iodine_scheduler_task_deferred_not_ready(intptr_t uuid, fio_protocol_s *fio_protocol) {
+  // if there's a read event, `fio_defer` will give it time to fulfill the protocol first;
+  // otherwise, the fiber will be resumed with `false` indicating the IO is not ready
+  fio_defer(iodine_scheduler_task_not_ready, (void *)uuid, (void *)fio_protocol);
+
+  (void)uuid;
+}
+
 static void iodine_scheduler_task_timeout(intptr_t uuid, fio_protocol_s *fio_protocol) {
   scheduler_protocol_s *protocol = (scheduler_protocol_s *)fio_protocol;
 
   if (!protocol->fulfilled) {
-    IodineCaller.call2(protocol->block, call_id, 1, timeout_args);
+    IodineCaller.call2(protocol->block, call_id, 1, e_timeout_args);
     protocol->fulfilled = 1;
   }
 }
@@ -69,8 +94,11 @@ static VALUE iodine_scheduler_attach(VALUE self, VALUE r_fd, VALUE r_waittype, V
   Check_Type(r_waittype, T_FIXNUM);
   size_t waittype = FIX2UINT(r_waittype);
 
-  Check_Type(r_timeout, T_FIXNUM);
-  size_t timeout = FIX2UINT(r_timeout);
+  size_t timeout;
+  if (r_timeout != Qnil) {
+    Check_Type(r_timeout, T_FIXNUM);
+    timeout = FIX2UINT(r_timeout);
+  }
 
   fio_set_non_block(fd);
 
@@ -107,8 +135,14 @@ static VALUE iodine_scheduler_attach(VALUE self, VALUE r_fd, VALUE r_waittype, V
   }
 
   intptr_t uuid = fio_fd2uuid(fd);
-  if (timeout) {
+
+  if (r_timeout == Qnil) {
+    fio_timeout_set(uuid, 0);
+  } else if (timeout) {
     fio_timeout_set(uuid, timeout);
+  } else {
+    // timeout was explicitly set to 0 - return right away
+    protocol->p.on_ready = iodine_scheduler_task_deferred_not_ready;
   }
 
   fio_watch(uuid, (fio_protocol_s *)protocol);
@@ -178,7 +212,9 @@ Scheduler initialization
 
 void iodine_scheduler_initialize(void) {
   call_id = rb_intern2("call", 4);
-  timeout_args[0] = UINT2NUM(ETIMEDOUT);
+  e_timeout_args[0] = INT2NUM(-ETIMEDOUT);
+  e_closed_args[0] = INT2NUM(-EIO);
+  e_not_ready_args[0] = Qfalse;
 
   VALUE SchedulerModule = rb_define_module_under(IodineModule, "Scheduler");
 

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '3.3.0'.freeze
+  VERSION = '4.1.0'.freeze
 end

data/lib/iodine.rb

@@ -156,12 +156,6 @@ require 'rack/handler/iodine' unless defined? ::Iodine::Rack::IODINE_RACK_LOADED
 
 ### Automatic ActiveRecord and Sequel support for forking (preventing connection sharing)
 Iodine.on_state(:before_fork)  do
-  if defined?(ActiveRecord) && defined?(ActiveRecord::Base) && ActiveRecord::Base.respond_to?(:connection)
-    begin
-      ActiveRecord::Base.connection.disconnect!
-    rescue
-    end
-  end
   if defined?(Sequel)
     begin
       Sequel::DATABASES.each { |database| database.disconnect }
@@ -169,14 +163,6 @@ Iodine.on_state(:before_fork)  do
     end
   end
 end
-Iodine.on_state(:after_fork)  do
-  if defined?(ActiveRecord) && defined?(ActiveRecord::Base) && ActiveRecord::Base.respond_to?(:establish_connection)
-    begin
-      ActiveRecord::Base.establish_connection
-    rescue
-    end
-  end
-end
 
 ### Parse CLI for default HTTP settings
 Iodine::Base::CLI.parse if defined?(IODINE_PARSE_CLI) && IODINE_PARSE_CLI

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rage-iodine
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Boaz Segev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-18 00:00:00.000000000 Z
+date: 2025-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake