rage-iodine 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14c91b97e06b90b30b47238df8eae6e431b1046bffb61758855a4a6f2fc647a4
-  data.tar.gz: 284676ad696fca697d05a8ac7e0d4f8159f6bf4d34105efea653fa07cc705f19
+  metadata.gz: 26c64867b568efaa1a0ae783f20270a2b5ed8c0fcc010092618c5d8dbc44c90b
+  data.tar.gz: 626631091ff1089858442160f6ef8e37acbed44dfa31f4840c8687ef6fa127c0
 SHA512:
-  metadata.gz: 5872a3cc209c22c85e6185a28e4a10dc5692426181766685580af260502dd09e6ff17f119b924a588d4a11a62c4e9a116e49640910219f4adf477e69914da590
-  data.tar.gz: 748d34cfcf129ecdbcd0cc3c00c72f0ece4c3e18703478d3f503448955915a4577720e70d33c2e39eafd8f52ca9c80d154986fae477b5ffbe56745bacaac2347
+  metadata.gz: 46a415053aeb26048f786b2231c303e0d420dd01c25e0bb549e5b982952254fef69939a9f5771cdf8a6a4b54604496ac78853dedfae21a7577481f6e2f242654
+  data.tar.gz: 06f1410986a09fa0d5316907d02aeab6875dd2d7887ae679c3b289e0bb6222c23b208ad2e221dd425f2991dd9f4dd358f8ed68aaea36fb6852fb58a97dc42a15

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/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

@@ -44,8 +44,11 @@ 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);
-  protocol->fulfilled = 1;
+
+  if (!protocol->fulfilled) {
+    IodineCaller.call(protocol->block, call_id);
+    protocol->fulfilled = 1;
+  }
 
   (void)uuid;
 }
@@ -55,7 +58,7 @@ static void iodine_scheduler_task_timeout(intptr_t uuid, fio_protocol_s *fio_pro
 
   if (!protocol->fulfilled) {
     IodineCaller.call2(protocol->block, call_id, 1, timeout_args);
-    fio_close(uuid);
+    protocol->fulfilled = 1;
   }
 }
 
@@ -127,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.0'.freeze
+  VERSION = '2.2.0'.freeze
 end

metadata

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