rage-iodine 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4221fdb6705dce60cb5e71da2644f639200571f690930fb9c428e29c4ae20032
-  data.tar.gz: c01222eb2a55634b414c456d46319e5d2072a2ed89b258e709ea1d236cf490b9
+  metadata.gz: ff8127ea56a3459eae3f01e41f5ec2b11b983d4c26733141ba008e91892b0ed8
+  data.tar.gz: fec97c38ebb1abcdb13fb7fdd96381c93e1d0d9f6b38017eb13ab7a349df396b
 SHA512:
-  metadata.gz: ad43ae3016c28c794926b71fd62b4f48c1362c7865f8c0118b8b5548ded1885b28c198a9d93f87a387873b4451b9f7310b545ba079cc26708521dc8c47497f7e
-  data.tar.gz: 0067566c6d7495bc2cc4652f49278d1eaa22f5afd9764cb84b654c44fd2483f7f14ccdcddd656b4ec529ad43c4d285ba8452976b075551c9683651ace0704a5a
+  metadata.gz: 4cc5c93fc4180649b61ca5e9d5e8e1b2bf60630b4b9893e6c9aa68439d07c78e750d3f51446eb89fb3809864a0841b975e8c3add2422e581a44799297dcf7088
+  data.tar.gz: 5434a1988b2f764cf285ac6d239c5c488d371b315944a5123fc397e9f0a98af9da8d4408c0adafb67b9ac2b1937ac175f13769a1ba36dac7477eada2270c4fdd

data/ext/iodine/iodine_http.c

@@ -569,7 +569,7 @@ static inline int ruby2c_response_send(iodine_http_request_handle_s *handle,
     if (body && rb_respond_to(body, close_method_id))
       IodineCaller.call(body, close_method_id);
     body = Qnil;
-    handle->type = IODINE_HTTP_NONE;
+    handle->type = IODINE_HTTP_EMPTY;
     return 0;
   }
   if (TYPE(body) == T_ARRAY) {

data/ext/iodine/scheduler.c

@@ -2,6 +2,7 @@
 #include "iodine_store.h"
 #include "ruby.h"
 
+#include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -14,6 +15,7 @@
 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];
 
 /* *****************************************************************************
 Fiber Scheduler API
@@ -27,6 +29,7 @@ static void noop(intptr_t uuid, fio_protocol_s *protocol) {
 typedef struct {
   fio_protocol_s p;
   VALUE block;
+  uint8_t fulfilled;
 } scheduler_protocol_s;
 
 
@@ -41,11 +44,24 @@ static void iodine_scheduler_task_close(intptr_t uuid, fio_protocol_s *fio_proto
 
 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);
+
+  if (!protocol->fulfilled) {
+    IodineCaller.call(protocol->block, call_id);
+    protocol->fulfilled = 1;
+  }
 
   (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);
+    protocol->fulfilled = 1;
+  }
+}
+
 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);
@@ -69,7 +85,7 @@ static VALUE iodine_scheduler_attach(VALUE self, VALUE r_fd, VALUE r_waittype, V
         .p.on_data = iodine_scheduler_task_perform,
         .p.on_ready = iodine_scheduler_task_perform,
         .p.on_close = iodine_scheduler_task_close,
-        .p.ping = noop,
+        .p.ping = iodine_scheduler_task_timeout,
         .block = block,
     };
   } else if (waittype & ATTACH_ON_READ_READY_CALLBACK) {
@@ -77,7 +93,7 @@ static VALUE iodine_scheduler_attach(VALUE self, VALUE r_fd, VALUE r_waittype, V
         .p.on_data = iodine_scheduler_task_perform,
         .p.on_ready = noop,
         .p.on_close = iodine_scheduler_task_close,
-        .p.ping = noop,
+        .p.ping = iodine_scheduler_task_timeout,
         .block = block,
     };
   } else if (waittype & ATTACH_ON_WRITE_READY_CALLBACK) {
@@ -85,7 +101,7 @@ static VALUE iodine_scheduler_attach(VALUE self, VALUE r_fd, VALUE r_waittype, V
         .p.on_data = noop,
         .p.on_ready = iodine_scheduler_task_perform,
         .p.on_close = iodine_scheduler_task_close,
-        .p.ping = noop,
+        .p.ping = iodine_scheduler_task_timeout,
         .block = block,
     };
   }
@@ -161,6 +177,7 @@ Scheduler initialization
 
 void iodine_scheduler_initialize(void) {
   call_id = rb_intern2("call", 4);
+  timeout_args[0] = UINT2NUM(ETIMEDOUT);
 
   VALUE SchedulerModule = rb_define_module_under(IodineModule, "Scheduler");
 

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rage-iodine
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Boaz Segev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-31 00:00:00.000000000 Z
+date: 2023-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake