rage-iodine 3.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15eb3d0d5e2834bc02a3e116dd07cd2fa36a73ad56ff7812579f1406a6d2874a
-  data.tar.gz: 3d9c061fe439e73a262a3c6ce0cd07f56d3ba2226b309caec539e202701e2249
+  metadata.gz: d96bd1cba30c10ee53b362f816e5c59fc05e16daecce52d294fd7fcb2f7d3727
+  data.tar.gz: aca815f5c9b722980cd94bd176b492d83888133f02eaa84aa4d04cc5275443eb
 SHA512:
-  metadata.gz: 2b8d6ed6f9372e1cbfdd089de2e6d9941e2ef20da98ac5f47e603bcd5369ea4afb51b89fb7e80e01869f4752a8679bcf094d60f3a29930641c98fabe2c3481d9
-  data.tar.gz: 39f880d839140587dde14e5e1fa3b68bdbb0e35db97333de28a0d024d9d3c8b18cb3575098baeaa813cfc8eb03b459e3042bf6a70aeeec5f57b60557eafddb38
+  metadata.gz: 26ad4b2eb5ebf8e3bc0ae5985b706a5126e9cddda0052e0bed5669979f794f71c7c2039a2dc867e38d00d7b06cd2d5954340821e8a725a3895d1ccf1cbac4d79
+  data.tar.gz: e4a708af24640800d5e86c2b0acfaaaaaddbfaeba1c818c9028a607de63898cc5eed57a244d74e935636c260e57b7ee54c02b44e219c2dbffdbc1be574a292de

data/CHANGELOG.md

@@ -6,9 +6,19 @@ Please notice that this change log contains changes for upcoming releases as wel
 
 ## Changes:
 
+#### Change log v.3.0.2 (2023-12-18)
+
+**Fix**: Correctly set timeout option.
+**Fix**: Correctly set max_clients option.
+
+#### Change log v.3.0.1 (2023-12-11)
+
+**Fix**: Disable scheduling request fibers.
+
 #### Change log v.3.0.0 (2023-12-09)
 
 **Update**: Schedule request fibers.
+**Update**: Improve stability and memory management under high load.
 
 #### Change log v.2.3.0 (2023-11-27)
 

data/Gemfile

@@ -5,7 +5,6 @@ group :test do
   gem 'rspec'
   gem 'rack'
   gem 'http'
-  gem "rage-rb"
 end
 
 # Specify your gem's dependencies in iodine.gemspec

data/ext/iodine/http_internal.h

@@ -106,7 +106,7 @@ static inline void http_s_new(http_s *h, http_fio_protocol_s *owner,
           },
       .headers = fiobj_hash_new(),
       .received_at = fio_last_tick(),
-      .status = 200
+      .status = 200,
   };
 }
 

data/ext/iodine/iodine.c

@@ -826,7 +826,7 @@ FIO_FUNC iodine_connection_args_s iodine_connect_args(VALUE s, uint8_t is_srv) {
     service = rb_sym2str(service);
     service_str = IODINE_RSTRINFO(service);
   }
-  if (timeout != Qnil && RB_TYPE_P(ping, T_FIXNUM)) {
+  if (timeout != Qnil && RB_TYPE_P(timeout, T_FIXNUM)) {
     if (FIX2ULONG(timeout) > 255)
       FIO_LOG_WARNING(":timeout value over 255 will be silently ignored.");
     else

data/ext/iodine/iodine_http.c

@@ -60,9 +60,8 @@ static ID each_method_id;
 static ID attach_method_id;
 static ID iodine_call_proc_id;
 static ID fiber_result_var_id;
+static VALUE http_wait_directive;
 static ID fiber_id_method_id;
-static VALUE rb_cFiber;
-static ID schedule_method_id;
 
 static VALUE env_template_no_upgrade;
 static VALUE env_template_websockets;
@@ -120,6 +119,7 @@ typedef struct {
     IODINE_HTTP_XSENDFILE,
     IODINE_HTTP_EMPTY,
     IODINE_HTTP_ERROR,
+    IODINE_HTTP_WAIT,
     IODINE_HTTP_DEFERRED,
   } type;
   enum iodine_upgrade_type_enum {
@@ -679,7 +679,6 @@ static inline void *iodine_handle_request_in_GVL(void *handle_) {
     goto err_not_found;
 
   if (handle->type == IODINE_HTTP_DEFERRED) {
-    // the deferred response is now ready so fetch it from the fiber
     rbresponse = rb_ivar_get((VALUE)h->fiber, fiber_result_var_id);
   } else {
     // create / register env variable
@@ -688,13 +687,8 @@ static inline void *iodine_handle_request_in_GVL(void *handle_) {
     tmp = IodineRackIO.create(h, env);
     // pass env variable to handler
     rbresponse = IodineCaller.call2((VALUE)h->udata, iodine_call_proc_id, 1, &env);
-    IodineStore.add(rbresponse);
     // close rack.io
     IodineRackIO.close(tmp);
-
-    // if there's a fiber in the http_s object means the request has to be deferred
-    if (h->fiber)
-      goto defer;
   }
 
   // test handler's return value
@@ -703,6 +697,13 @@ static inline void *iodine_handle_request_in_GVL(void *handle_) {
   }
 
   tmp = rb_ary_entry(rbresponse, 0);
+  // rack will return `[:__http_defer__, fiber_to_wait_on]` in case the request needs to be paused
+  if (TYPE(tmp) == T_SYMBOL && tmp == http_wait_directive) {
+    h->fiber = (void *)IodineStore.add(rb_ary_entry(rbresponse, 1));
+    goto defer;
+  }
+
+  IodineStore.add(rbresponse);
   // set response status
   if (TYPE(tmp) == T_STRING) {
     char *data = RSTRING_PTR(tmp);
@@ -741,7 +742,8 @@ static inline void *iodine_handle_request_in_GVL(void *handle_) {
   // review each header and write it to the response.
   rb_hash_foreach(response_headers, for_each_header_data, (VALUE)(h));
   // review for upgrade.
-  if (handle->type != IODINE_HTTP_DEFERRED && (intptr_t)h->status < 300 && ruby2c_review_upgrade(handle, rbresponse, env))
+  if (handle->type != IODINE_HTTP_DEFERRED && (intptr_t)h->status < 300 &&
+      ruby2c_review_upgrade(handle, rbresponse, env))
     goto external_done;
   // send the request body.
   if (ruby2c_response_send(handle, rbresponse, env))
@@ -750,31 +752,32 @@ static inline void *iodine_handle_request_in_GVL(void *handle_) {
 finish:
   IodineStore.remove(rbresponse);
   IodineStore.remove(env);
-  return (void *)rbresponse;
+  return NULL;
 
 external_done:
   IodineStore.remove(rbresponse);
   IodineStore.remove(env);
   handle->type = IODINE_HTTP_NONE;
-  return (void *)rbresponse;
+  return NULL;
 
 err_not_found:
   IodineStore.remove(rbresponse);
   IodineStore.remove(env);
   h->status = 404;
   handle->type = IODINE_HTTP_ERROR;
-  return (void *)rbresponse;
+  return NULL;
 
 internal_error:
   IodineStore.remove(rbresponse);
   IodineStore.remove(env);
   h->status = 500;
   handle->type = IODINE_HTTP_ERROR;
-  return (void *)rbresponse;
+  return NULL;
 
 defer:
   IodineStore.remove(env);
-  return (void *)rbresponse;
+  handle->type = IODINE_HTTP_WAIT;
+  return NULL;
 }
 
 static inline void
@@ -823,10 +826,11 @@ static inline void http_resume_deferred_request_handler(http_s *h) {
     .type = IODINE_HTTP_DEFERRED,
   };
 
-  IodineCaller.enterGVL((void *(*)(void *))iodine_handle_request_in_GVL, &handle);
+  IodineCaller.enterGVL((void *(*)(void *))iodine_handle_request_in_GVL,
+                        &handle);
 
-  IodineStore.remove((VALUE)h->fiber);
   fio_unsubscribe((subscription_s *)h->subscription);
+  IodineStore.remove((VALUE)h->fiber);
 
   iodine_perform_handle_action(handle);
 }
@@ -835,9 +839,10 @@ static inline void on_iodine_request_id_message(fio_msg_s *msg) {
   http_resume((http_pause_handle_s *)msg->udata1, http_resume_deferred_request_handler, NULL);
 }
 
+// when Ruby sends a message into the `fiber_id` channel means the fiber attached to
+// to the `http_s h` var can be resumed
 static inline void http_pause_request_handler(http_pause_handle_s *s) {
   VALUE fiber_id = rb_funcall((VALUE)s->fiber, fiber_id_method_id, 0);
-
   subscription_s *sub = fio_subscribe(.channel = {0, RSTRING_LEN(fiber_id), RSTRING_PTR(fiber_id)},
                                       .on_message = on_iodine_request_id_message,
                                       .udata1 = (void *)s);
@@ -845,31 +850,16 @@ static inline void http_pause_request_handler(http_pause_handle_s *s) {
   s->subscription = (void *)sub;
 }
 
-static VALUE fiber_request_block(RB_BLOCK_CALL_FUNC_ARGLIST(_, handle_)) {
-  VALUE fiber_id = rb_funcall(rb_fiber_current(), fiber_id_method_id, 0);
-
-  iodine_http_request_handle_s *handle = (iodine_http_request_handle_s *)handle_;
-  VALUE rbresponse = (VALUE)IodineCaller.enterGVL((void *(*)(void *))iodine_handle_request_in_GVL, handle);
-
-  fio_publish(.channel = {0, RSTRING_LEN(fiber_id), RSTRING_PTR(fiber_id)});
-  rb_ivar_set(rb_fiber_current(), fiber_result_var_id, rbresponse);
-
-  return rbresponse;
-}
-
 static void on_rack_request(http_s *h) {
   iodine_http_request_handle_s handle = (iodine_http_request_handle_s){
       .h = h,
       .upgrade = IODINE_UPGRADE_NONE,
   };
+  IodineCaller.enterGVL((void *(*)(void *))iodine_handle_request_in_GVL,
+                        &handle);
 
-  VALUE fiber = rb_block_call(rb_cFiber, schedule_method_id, 0, NULL, fiber_request_block, (VALUE)&handle);
-
-  // the fiber encountered blocking IO and yielded - pause the request
-  if (rb_fiber_alive_p(fiber)) {
-    IodineStore.add(fiber);
-    h->fiber = (void *)fiber;
-    http_pause(h, http_pause_request_handler);
+  if (handle.type == IODINE_HTTP_WAIT) {
+    http_pause(handle.h, http_pause_request_handler);
   } else {
     iodine_perform_handle_action(handle);
   }
@@ -1037,7 +1027,7 @@ intptr_t iodine_http_listen(iodine_connection_args_s args){
       .on_upgrade = on_rack_upgrade, .udata = (void *)args.handler,
       .timeout = args.timeout, .ws_timeout = args.ping,
       .ws_max_msg_size = args.max_msg, .max_header_size = args.max_headers,
-      .on_finish = free_iodine_http, .log = args.log,
+      .on_finish = free_iodine_http, .log = args.log, .max_clients = args.max_clients,
       .max_body_size = args.max_body, .public_folder = args.public.data);
 #else
   intptr_t uuid = http_listen(
@@ -1045,7 +1035,7 @@ intptr_t iodine_http_listen(iodine_connection_args_s args){
       .on_upgrade = on_rack_upgrade, .udata = (void *)args.handler,
       .tls = args.tls, .timeout = args.timeout, .ws_timeout = args.ping,
       .ws_max_msg_size = args.max_msg, .max_header_size = args.max_headers,
-      .on_finish = free_iodine_http, .log = args.log,
+      .on_finish = free_iodine_http, .log = args.log, .max_clients = args.max_clients,
       .max_body_size = args.max_body, .public_folder = args.public.data);
 #endif
   if (uuid == -1)
@@ -1249,9 +1239,8 @@ void iodine_init_http(void) {
   attach_method_id = rb_intern("attach_fd");
   iodine_call_proc_id = rb_intern("call");
   fiber_result_var_id = rb_intern("@__result");
+  http_wait_directive = ID2SYM(rb_intern("__http_defer__"));
   fiber_id_method_id = rb_intern("__get_id");
-  rb_cFiber = rb_const_get(rb_cObject, rb_intern("Fiber"));
-  schedule_method_id = rb_intern("schedule");
 
   IodineUTF8Encoding = rb_enc_find("UTF-8");
   IodineBinaryEncoding = rb_enc_find("binary");

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.0.2'.freeze
 end

metadata

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