rage-iodine 2.1.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff8127ea56a3459eae3f01e41f5ec2b11b983d4c26733141ba008e91892b0ed8
-  data.tar.gz: fec97c38ebb1abcdb13fb7fdd96381c93e1d0d9f6b38017eb13ab7a349df396b
+  metadata.gz: 0c7dd77022028a6bdd65a929622793240c5c6d844ed91b46741a7964ef8b734b
+  data.tar.gz: a03c8b323b45d88304cb628201bce9a90d8eb31263b0bc7ebf303beb09c2ce25
 SHA512:
-  metadata.gz: 4cc5c93fc4180649b61ca5e9d5e8e1b2bf60630b4b9893e6c9aa68439d07c78e750d3f51446eb89fb3809864a0841b975e8c3add2422e581a44799297dcf7088
-  data.tar.gz: 5434a1988b2f764cf285ac6d239c5c488d371b315944a5123fc397e9f0a98af9da8d4408c0adafb67b9ac2b1937ac175f13769a1ba36dac7477eada2270c4fdd
+  metadata.gz: e5d438ae9a488b9d814b43bb915adb2035bf64f094740d8ead2ef4a402f3e095ac894e50608bba819e7bb5abc26c8aff1cfe902022cebb8deb165976ff1095f3
+  data.tar.gz: fc9ae3246f6226feafca77dc6c0d52d73629c107daea5fffaa95bb89cfe4775b522d8222f90336e8dcc4e30a794a678a0dab316ebcb564c28d932107d485ede5

data/ext/iodine/fio.c

@@ -2051,7 +2051,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))) {
+        if (events[i].events & (~(EPOLLIN | EPOLLOUT | EPOLLHUP | EPOLLRDHUP))) {
           // errors are hendled as disconnections (on_close)
           fio_force_close_in_poll(fd2uuid(events[i].data.fd));
         } else {
@@ -2060,9 +2060,14 @@ static size_t fio_poll(void) {
             fio_defer_push_urgent(deferred_on_ready,
                                   (void *)fd2uuid(events[i].data.fd), NULL);
           }
-          if (events[i].events & EPOLLIN)
+          if (events[i].events & EPOLLIN) {
             fio_defer_push_task(deferred_on_data,
                                 (void *)fd2uuid(events[i].data.fd), NULL);
+          }
+          if (events[i].events & (EPOLLHUP | EPOLLRDHUP)) {
+            fio_defer_push_task(fio_force_close_in_poll,
+                                (void *)fd2uuid(events[i].data.fd), NULL);
+          }
         }
       } // end for loop
       total += active_count;
@@ -2197,7 +2202,8 @@ static size_t fio_poll(void) {
                             NULL);
       }
       if (events[i].flags & (EV_EOF | EV_ERROR)) {
-        fio_force_close_in_poll(fd2uuid(events[i].udata));
+        fio_defer_push_task(fio_force_close_in_poll,
+                            (void *)fd2uuid(events[i].udata), NULL);
       }
     }
   } else if (active_count < 0) {

data/ext/iodine/http.c

@@ -2361,6 +2361,43 @@ size_t http_date2rfc7231(char *target, struct tm *tmbuf) {
   return pos - target;
 }
 
+size_t http_date2timestamp(char *target, struct tm *tmbuf) {
+  char *pos = target;
+  uint16_t tmp;
+  pos += fio_ltoa(pos, tmbuf->tm_year + 1900, 10);
+  *(pos++) = '-';
+  tmp = (tmbuf->tm_mon + 1) / 10;
+  pos[0] = '0' + tmp;
+  pos[1] = '0' + ((tmbuf->tm_mon + 1) - (tmp * 10));
+  pos += 2;
+  *(pos++) = '-';
+  tmp = (tmbuf->tm_mday) / 10;
+  pos[0] = '0' + tmp;
+  pos[1] = '0' + (tmbuf->tm_mday - (tmp * 10));
+  pos += 2;
+  *(pos++) = 'T';
+  tmp = tmbuf->tm_hour / 10;
+  pos[0] = '0' + tmp;
+  pos[1] = '0' + (tmbuf->tm_hour - (tmp * 10));
+  pos[2] = ':';
+  tmp = tmbuf->tm_min / 10;
+  pos[3] = '0' + tmp;
+  pos[4] = '0' + (tmbuf->tm_min - (tmp * 10));
+  pos[5] = ':';
+  tmp = tmbuf->tm_sec / 10;
+  pos[6] = '0' + tmp;
+  pos[7] = '0' + (tmbuf->tm_sec - (tmp * 10));
+  pos += 8;
+  pos[0] = '+';
+  pos[1] = '0';
+  pos[2] = '0';
+  pos[3] = ':';
+  pos[4] = '0';
+  pos[5] = '0';
+  pos += 6;
+  return pos - target;
+}
+
 size_t http_date2str(char *target, struct tm *tmbuf);
 
 size_t http_date2rfc2822(char *target, struct tm *tmbuf) {

data/ext/iodine/http.h

@@ -918,6 +918,8 @@ size_t http_date2rfc7231(char *target, struct tm *tmbuf);
 size_t http_date2rfc2109(char *target, struct tm *tmbuf);
 /** Writes an RFC 2822 date representation to target. */
 size_t http_date2rfc2822(char *target, struct tm *tmbuf);
+/** Writes a timestamp to target. */
+size_t http_date2timestamp(char *target, struct tm *tmbuf);
 /**
 Writes an HTTP date string to the `target` buffer.
 

data/ext/iodine/iodine_helpers.c

@@ -456,6 +456,38 @@ static VALUE parse_multipart(VALUE self, VALUE rack_io, VALUE content_type) {
   (void)self;
 }
 
+/**
+Generate a timestamp to use in logs.
+*/
+static VALUE gen_timestamp(VALUE self) {
+  struct tm tm;
+  time_t last_tick = fio_last_tick().tv_sec;
+  http_gmtime(last_tick, &tm);
+
+  char buffer[32];
+  size_t len = http_date2timestamp(buffer, &tm);
+
+  return rb_str_new(buffer, len);
+}
+
+static const char request_tag_seed[] = "abcdefghijklmnopqrstuvwxyz0123456789";
+static const uint8_t request_tag_len = 16;
+
+/**
+Generate a request tag to use in logs.
+*/
+static VALUE gen_request_tag(VALUE self) {
+  char buffer[request_tag_len];
+  uint8_t i, random_index;
+
+  for (i = 0; i < request_tag_len; i++) {
+    random_index = rand() % 36;
+    buffer[i] = request_tag_seed[random_index];
+  }
+
+  return rb_str_new(buffer, request_tag_len);
+}
+
 /* *****************************************************************************
 Ruby Initialization
 ***************************************************************************** */
@@ -511,6 +543,8 @@ Results:
   rb_define_module_function(tmp, "parse_nested_query", parse_nested_query, 1);
   rb_define_module_function(tmp, "parse_urlencoded_nested_query", parse_urlencoded_nested_query, 1);
   rb_define_module_function(tmp, "parse_multipart", parse_multipart, 2);
+  rb_define_module_function(tmp, "gen_timestamp", gen_timestamp, 0);
+  rb_define_module_function(tmp, "gen_request_tag", gen_request_tag, 0);
 
   /*
 The monkey-patched methods are in this module, allowing Iodine::Rack::Utils to
@@ -529,4 +563,6 @@ include non-patched methods as well.
   rb_define_singleton_method(tmp, "rfc2109", iodine_rfc2109, 1);
   rb_define_singleton_method(tmp, "rfc2822", iodine_rfc2822, 1);
   // rb_define_module_function(IodineUtils, "time2str", date_str, -1);
+
+  srand(time(0));
 }

data/ext/iodine/scheduler.c

@@ -130,8 +130,9 @@ static VALUE iodine_scheduler_write(VALUE self, VALUE r_fd, VALUE r_buffer, VALU
   Check_Type(r_offset, T_FIXNUM);
   int offset = FIX2INT(r_offset);
 
-  fio_write2(fio_fd2uuid(fd), .data.buffer = buffer, .length = length, .offset = offset,
-             .after.dealloc = FIO_DEALLOC_NOOP);
+  void *cpy = fio_malloc(length);
+  memcpy(cpy, buffer, length);
+  fio_write2(fio_fd2uuid(fd), .data.buffer = cpy, .length = length, .offset = offset, .after.dealloc = fio_free);
 
   return r_length;
 

data/lib/iodine/version.rb

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

metadata

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