iodine 0.7.21 → 0.7.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0f9360224da57145ba3ed9e81d5e5472cf9bb9732c9d36fab6e22c32428013a
-  data.tar.gz: e04fc9d016bbb53cf80d810765a5b934d0d996d447faadd6451c27612cd17da6
+  metadata.gz: 8932b4e432bde801ae72ddb5a757e178a3fa2ca061527521c2b941d964be8920
+  data.tar.gz: a6d6c4056060ad82e0b735aa6ebf067cbde0f5a6bda6d9a16fea1c62ba7b14df
 SHA512:
-  metadata.gz: 970307f1349dd8ca00a6caa6bfb59c6485f05fdb0b1654dd2788f3b477f628aa9b1c24a9df0873409930dd071dc446e999164731892fe7d70a64983f49a72d99
-  data.tar.gz: aa2417372b97f415ee83edd7aa0ecd557cef4144eba546cd931bc36078574cc03b574f16a395a779957015084c1737b996d13337516ac474efa78d4140075035
+  metadata.gz: e3d3bef35a9ca6707ab14105ec5a6c6bab88cb23666be74892f6d56c3ae829a21d3bd03fee40096d891b6db147f1c1935b3c379c4e93192d15f18094e2da1760
+  data.tar.gz: f50bd45abd3d7cecb8156912168ee265936c1a39e51d378c70ceffeab4d0c884cf8959611a1fcbeb03146b1460ec874b7164d57b636dedae5b1f505fe49b88b1

data/CHANGELOG.md

@@ -6,6 +6,10 @@ Please notice that this change log contains changes for upcoming releases as wel
 
 ## Changes:
 
+#### Change log v.0.7.22
+
+**Fix**: (`fio`, `redis`) fixed IPC messages between redis connections (in the master process) and callback blocks (executed in the worker processes). Credit to @moxgeek (Marouane Elmidaoui) for exposing this issue (plezi#31).
+
 #### Change log v.0.7.21
 
 **Fix**: (`iodine`, `redis`) Redis response was attempting to create Ruby objects outside the GIL. This is now fixed by entering the GIL earlier (before objects are created). Credit to @moxgeek (Marouane Elmidaoui) for exposing this issue (plezi#31).

data/README.md

@@ -64,6 +64,12 @@ Then start your application from the command-line / terminal using iodine:
 bundler exec iodine
 ```
 
+**KNOWN ISSUE:** the installation script tests for OpenSSL 1.1.0 and above. However, this testing approach sometimes provides false positives. If TLS isn't required, install with `NO_SSL=1`. i.e.:
+
+```bash
+NO_SSL=1 bundler exec iodine
+```
+
 ### Running with Rails
 
 On Rails:
@@ -77,8 +83,8 @@ On Rails:
     ```ruby
     # Iodine setup - use conditional setup to allow command-line arguments to override these:
     if(defined?(Iodine))
-      Iodine.threads = ENV.fetch("RAILS_MAX_THREADS") { 5 } if Iodine.threads.zero?
-      Iodine.workers = ENV.fetch("WEB_CONCURRENCY") { 2 } if Iodine.workers.zero?
+      Iodine.threads = ENV.fetch("RAILS_MAX_THREADS", 5).to_i if Iodine.threads.zero?
+      Iodine.workers = ENV.fetch("WEB_CONCURRENCY", 2).to_i if Iodine.workers.zero?
       Iodine::DEFAULT_SETTINGS[:port] = ENV.fetch("PORT") if ENV.fetch("PORT")
     end
     ```

data/ext/iodine/fio.h

@@ -3876,14 +3876,23 @@ inline FIO_FUNC fio_str_info_s fio_str_resize(fio_str_s *s, size_t size) {
   if (!s || s->frozen) {
     return fio_str_info(s);
   }
-  fio_str_capa_assert(s, size);
   if (s->small || !s->data) {
+    if (size >= FIO_STR_SMALL_CAPA) {
+      s->small = (uint8_t)(((FIO_STR_SMALL_CAPA << 1) | 1) & 0xFF);
+      fio_str_capa_assert(s, size);
+      goto big;
+    }
     s->small = (uint8_t)(((size << 1) | 1) & 0xFF);
     FIO_STR_SMALL_DATA(s)[size] = 0;
     return (fio_str_info_s){.capa = (FIO_STR_SMALL_CAPA - 1),
                             .len = size,
                             .data = FIO_STR_SMALL_DATA(s)};
   }
+  if (size >= s->capa) {
+    s->len = s->capa;
+    fio_str_capa_assert(s, size);
+  }
+big:
   s->len = size;
   s->data[size] = 0;
   return (fio_str_info_s){.capa = s->capa, .len = size, .data = s->data};

data/ext/iodine/fiobj_json.c

@@ -189,7 +189,7 @@ static void write_safe_str(FIOBJ dest, const FIOBJ str) {
   }
   while (len) {
     char *restrict writer = (char *)t.data;
-    while (len && (src[0] > 32 && src[0] != '"' && src[0] != '\\')) {
+    while (len && src[0] > 32 && src[0] != '"' && src[0] != '\\') {
       len--;
       writer[end++] = *(src++);
     }
@@ -245,13 +245,11 @@ static void write_safe_str(FIOBJ dest, const FIOBJ str) {
     src++;
     len--;
     if (added >= 48 && capa <= end + len + 64) {
-      if (0) {
-        capa = (((capa >> 12) + 1) << 12) - 1;
-        capa = fiobj_str_capa_assert(dest, capa);
-      } else {
-        capa = fiobj_str_capa_assert(dest, (end + len + 64));
-      }
+      writer[end] = 0;
+      fiobj_str_resize(dest, (end + len + 64));
       t = fiobj_obj2cstr(dest);
+      writer = (char *)t.data;
+      capa = t.capa;
       added = 0;
     }
   }

data/ext/iodine/redis_engine.c

@@ -72,9 +72,9 @@ typedef struct {
 static inline void redis_internal_reset(struct redis_engine_internal_s *i) {
   i->buf_pos = 0;
   i->parser = (resp_parser_s){.obj_countdown = 0, .expecting = 0};
-  fiobj_free(i->str);
+  fiobj_free((FIOBJ)fio_ct_if(i->ary == FIOBJ_INVALID, (uintptr_t)i->str,
+                              (uintptr_t)i->ary));
   i->str = FIOBJ_INVALID;
-  fiobj_free(i->ary);
   i->ary = FIOBJ_INVALID;
   i->ary_count = 0;
   i->nesting = 0;
@@ -106,9 +106,7 @@ static inline void redis_free(redis_engine_s *r) {
 Simple RESP formatting
 ***************************************************************************** */
 
-inline static void fiobj2resp2(FIOBJ dest, FIOBJ obj) {
-  if (fiobj_hash_key_in_loop())
-    fiobj2resp2(dest, fiobj_hash_key_in_loop());
+inline static void fiobj2resp___internal(FIOBJ dest, FIOBJ obj) {
   fio_str_info_s s;
   switch (FIOBJ_TYPE(obj)) {
   case FIOBJ_T_NULL:
@@ -155,7 +153,9 @@ inline static void fiobj2resp2(FIOBJ dest, FIOBJ obj) {
 }
 
 static int fiobj2resp_task(FIOBJ o, void *dest_) {
-  fiobj2resp2((FIOBJ)dest_, o);
+  if (fiobj_hash_key_in_loop())
+    fiobj2resp___internal((FIOBJ)dest_, fiobj_hash_key_in_loop());
+  fiobj2resp___internal((FIOBJ)dest_, o);
   return 0;
 }
 

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '0.7.21'.freeze
+  VERSION = '0.7.22'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.7.21
+  version: 0.7.22
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-01 00:00:00.000000000 Z
+date: 2019-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -220,7 +220,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 'Thank you for installing Iodine 0.7.21.
+post_install_message: 'Thank you for installing Iodine 0.7.22.
 
 '
 rdoc_options: []