iodine 0.7.9 → 0.7.10

data/ext/iodine/fio.h

@@ -109,7 +109,7 @@ Version and helper macros
 #define FIO_VERSION_MAJOR 0
 #define FIO_VERSION_MINOR 7
 #define FIO_VERSION_PATCH 0
-#define FIO_VERSION_BETA 2
+#define FIO_VERSION_BETA 3
 
 /* Automatically convert version data to a string constant - ignore these two */
 #define FIO_MACRO2STR_STEP2(macro) #macro
@@ -167,7 +167,8 @@ Version and helper macros
 
 #ifndef FIO_PRINT_STATE
 /**
- * Prints some state massages to stderr (startup / shutdown / etc').
+ * Enables the FIO_LOG_STATE(msg,...) macro, which prints information level
+ * messages to stderr.
  */
 #define FIO_PRINT_STATE 1
 #endif
@@ -328,7 +329,7 @@ void *fio_mmap(size_t size);
 void fio_malloc_after_fork(void);
 
 #if FIO_FORCE_MALLOC
-#define FIO_MALLOC(size) malloc((size))
+#define FIO_MALLOC(size) calloc((size), 1)
 #define FIO_CALLOC(size, units) calloc((size), (units))
 #define FIO_REALLOC(ptr, new_length, existing_data_length)                     \
   realloc((ptr), (new_length))
@@ -1713,8 +1714,6 @@ struct fio_msg_metadata_s {
   void (*on_finish)(fio_msg_s *msg, void *metadata);
   /** The pointer to be disclosed to the `fio_message_metadata` function. */
   void *metadata;
-  /** RESERVED for internal use (Metadata linked list). */
-  fio_msg_metadata_s *next;
 };
 
 /**

data/ext/iodine/fiobj_mustache.c

@@ -66,7 +66,7 @@ b = a.map {|s| s.length }
 puts "static char *html_escape_strs[] = {", a.to_s.slice(1..-2) ,"};",
      "static uint8_t html_escape_len[] = {", b.to_s.slice(1..-2),"};"
 */
-static char *html_escape_strs[] = {
+static const char *html_escape_strs[] = {
     "�", "", "", "", "", "", "",
     "", "", "	", "
", "", "", "
",
     "", "", "", "", "", "", "",

data/ext/iodine/fiobj_numbers.c

@@ -53,12 +53,12 @@ static fio_str_info_s fio_i2str(const FIOBJ o) {
 }
 static fio_str_info_s fio_f2str(const FIOBJ o) {
   if (isnan(obj2float(o)->f))
-    return (fio_str_info_s){.data = "NaN", .len = 3};
+    return (fio_str_info_s){.data = (char *)"NaN", .len = 3};
   else if (isinf(obj2float(o)->f)) {
     if (obj2float(o)->f > 0)
-      return (fio_str_info_s){.data = "Infinity", .len = 8};
+      return (fio_str_info_s){.data = (char *)"Infinity", .len = 8};
     else
-      return (fio_str_info_s){.data = "-Infinity", .len = 9};
+      return (fio_str_info_s){.data = (char *)"-Infinity", .len = 9};
   }
   return (fio_str_info_s){
       .data = num_buffer,

data/ext/iodine/http.c

@@ -608,8 +608,8 @@ found_file:
   switch (s.len) {
   case 7:
     if (!strncasecmp("options", s.data, 7)) {
-      http_set_header2(h, (fio_str_info_s){.data = "allow", .len = 5},
-                       (fio_str_info_s){.data = "GET, HEAD", .len = 9});
+      http_set_header2(h, (fio_str_info_s){.data = (char *)"allow", .len = 5},
+                       (fio_str_info_s){.data = (char *)"GET, HEAD", .len = 9});
       h->status = 200;
       http_finish(h);
       return 0;
@@ -694,7 +694,8 @@ int http_send_error(http_s *r, size_t error) {
   if (http_sendfile2(r, http2protocol(r)->settings->public_folder,
                      http2protocol(r)->settings->public_folder_length, buffer,
                      pos)) {
-    http_set_header(r, HTTP_HEADER_CONTENT_TYPE, http_mimetype_find("txt", 3));
+    http_set_header(r, HTTP_HEADER_CONTENT_TYPE,
+                    http_mimetype_find((char *)"txt", 3));
     fio_str_info_s t = http_status2str(error);
     http_send_body(r, t.data, t.len);
   }
@@ -1148,15 +1149,15 @@ intptr_t http_connect(const char *address,
     } else {
       p++;
       if (!len) {
-        a = "localhost";
+        a = (char *)"localhost";
         len = 9;
       }
     }
   } else {
     if (is_secure)
-      p = "443";
+      p = (char *)"443";
     else
-      p = "80";
+      p = (char *)"80";
   }
 
   /* set settings */
@@ -1179,7 +1180,7 @@ intptr_t http_connect(const char *address,
   h->status = 0;
   h->path = path;
   settings->udata = h;
-  http_set_header2(h, (fio_str_info_s){.data = "host", .len = 4},
+  http_set_header2(h, (fio_str_info_s){.data = (char *)"host", .len = 4},
                    (fio_str_info_s){.data = a, .len = len});
   intptr_t ret;
   if (is_websocket) {
@@ -1302,7 +1303,7 @@ static void http_sse_on_unsubscribe(void *sse_, void *args_) {
   struct http_sse_subscribe_args *args = args_;
   if (args->on_unsubscribe)
     args->on_unsubscribe(args->udata);
-  free(args);
+  fio_free(args);
   http_sse_try_free(sse);
 }
 
@@ -1328,7 +1329,7 @@ uintptr_t http_sse_subscribe(http_sse_s *sse_,
     return 0;
   if (!args.on_message)
     args.on_message = http_sse_on_message__direct;
-  struct http_sse_subscribe_args *udata = malloc(sizeof(*udata));
+  struct http_sse_subscribe_args *udata = fio_malloc(sizeof(*udata));
   FIO_ASSERT_ALLOC(udata);
   *udata = args;
 
@@ -1403,15 +1404,15 @@ int http_sse_write(http_sse_s *sse, struct http_sse_write_args args) {
                          args.data.len + 2 + 7 + 10 + 4;
     buf = fiobj_str_buf(total);
   }
-  http_sse_copy2str(buf, "id: ", 4, args.id);
-  http_sse_copy2str(buf, "event: ", 7, args.event);
+  http_sse_copy2str(buf, (char *)"id: ", 4, args.id);
+  http_sse_copy2str(buf, (char *)"event: ", 7, args.event);
   if (args.retry) {
     FIOBJ i = fiobj_num_new(args.retry);
-    fiobj_str_write(buf, "retry: ", 7);
+    fiobj_str_write(buf, (char *)"retry: ", 7);
     fiobj_str_join(buf, i);
     fiobj_free(i);
   }
-  http_sse_copy2str(buf, "data: ", 6, args.data);
+  http_sse_copy2str(buf, (char *)"data: ", 6, args.data);
   fiobj_str_write(buf, "\r\n", 2);
   return FIO_LS_EMBD_OBJ(http_sse_internal_s, sse, sse)
       ->vtable->http_sse_write(sse, buf);
@@ -2819,7 +2820,7 @@ static char invalid_cookie_value_char[256] = {
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
 
 // clang-format off
-#define HTTP_SET_STATUS_STR(status, str) [status-100] = { .data = (str), .len = (sizeof(str) - 1) }
+#define HTTP_SET_STATUS_STR(status, str) [status-100] = { .data = (char *)(str), .len = (sizeof(str) - 1) }
 // clang-format on
 
 /** Returns the status as a C string struct */

data/ext/iodine/http1.c

@@ -442,7 +442,7 @@ static uint8_t http1_sse_on_shutdown(intptr_t uuid, fio_protocol_s *p_) {
 static void http1_sse_on_close(intptr_t uuid, fio_protocol_s *p_) {
   http1_sse_fio_protocol_s *p = (http1_sse_fio_protocol_s *)p_;
   http_sse_destroy(p->sse);
-  free(p);
+  fio_free(p);
   (void)uuid;
 }
 static void http1_sse_ping(intptr_t uuid, fio_protocol_s *p_) {
@@ -472,7 +472,7 @@ static int http1_upgrade2sse(http_s *h, http_sse_s *sse) {
   htt1p_finish(h); /* avoid the enforced content length in http_finish */
 
   /* switch protocol to SSE */
-  http1_sse_fio_protocol_s *sse_pr = malloc(sizeof(*sse_pr));
+  http1_sse_fio_protocol_s *sse_pr = fio_malloc(sizeof(*sse_pr));
   if (!sse_pr)
     goto failed;
   *sse_pr = (http1_sse_fio_protocol_s){
@@ -483,7 +483,7 @@ static int http1_upgrade2sse(http_s *h, http_sse_s *sse) {
               .on_close = http1_sse_on_close,
               .ping = http1_sse_ping,
           },
-      .sse = malloc(sizeof(*(sse_pr->sse))),
+      .sse = fio_malloc(sizeof(*(sse_pr->sse))),
   };
 
   if (!sse_pr->sse)
@@ -763,7 +763,7 @@ fio_protocol_s *http1_new(uintptr_t uuid, http_settings_s *settings,
                           void *unread_data, size_t unread_length) {
   if (unread_data && unread_length > HTTP_MAX_HEADER_LENGTH)
     return NULL;
-  http1pr_s *p = malloc(sizeof(*p) + HTTP_MAX_HEADER_LENGTH);
+  http1pr_s *p = fio_malloc(sizeof(*p) + HTTP_MAX_HEADER_LENGTH);
   FIO_ASSERT_ALLOC(p);
   *p = (http1pr_s){
       .p.protocol =
@@ -791,7 +791,7 @@ void http1_destroy(fio_protocol_s *pr) {
   http1pr_s *p = (http1pr_s *)pr;
   http1_pr2handle(p).status = 0;
   http_s_destroy(&http1_pr2handle(p), 0);
-  free(p);
+  fio_free(p);
 }
 
 /* *****************************************************************************
@@ -799,7 +799,7 @@ Protocol Data
 ***************************************************************************** */
 
 // clang-format off
-#define HTTP_SET_STATUS_STR(status, str) [((status)-100)] = { .data = ("HTTP/1.1 " #status " " str "\r\n"), .len = (sizeof("HTTP/1.1 " #status " " str "\r\n") - 1) }
+#define HTTP_SET_STATUS_STR(status, str) [((status)-100)] = { .data = (char*)("HTTP/1.1 " #status " " str "\r\n"), .len = (sizeof("HTTP/1.1 " #status " " str "\r\n") - 1) }
 // #undef HTTP_SET_STATUS_STR
 // clang-format on
 

data/ext/iodine/http1_parser.c

@@ -169,7 +169,7 @@ inline static int consume_request_line(struct http1_fio_parser_args_s *args,
       return -1;
     *tmp = ' ';
     if (!seek2ch(&host_end, tmp, '/')) {
-      if (args->on_path(args->parser, "/", 1))
+      if (args->on_path(args->parser, (char *)"/", 1))
         return -1;
       goto start_version;
     }
@@ -201,8 +201,8 @@ start_version:
   if (args->on_http_version(args->parser, (char *)start, end - start))
     return -1;
   /* */
-  if (host_start && args->on_header(args->parser, "host", 4, (char *)host_start,
-                                    host_end - host_start))
+  if (host_start && args->on_header(args->parser, (char *)"host", 4,
+                                    (char *)host_start, host_end - host_start))
     return -1;
   return 0;
 }

data/ext/iodine/http_internal.c

@@ -68,7 +68,7 @@ upgrade:
     return;
   }
 eventsource:
-  settings->on_upgrade(h, "sse", 3);
+  settings->on_upgrade(h, (char *)"sse", 3);
   return;
 }
 
@@ -252,8 +252,8 @@ static void http_lib_init(void *ignr_) {
   fiobj_obj2hash(HTTP_HVALUE_WS_VERSION);
 
 #define REGISTER_MIME(ext, type)                                               \
-  http_mimetype_register(ext, sizeof(ext) - 1,                                 \
-                         fiobj_str_new(type, sizeof(type) - 1))
+  http_mimetype_register((char *)ext, sizeof(ext) - 1,                         \
+                         fiobj_str_new((char *)type, sizeof(type) - 1))
 
   REGISTER_MIME("123", "application/vnd.lotus-1-2-3");
   REGISTER_MIME("3dml", "text/vnd.in3d.3dml");

data/ext/iodine/http_internal.h

@@ -175,7 +175,7 @@ static inline void http_sse_init(http_sse_internal_s *sse, intptr_t uuid,
 static inline void http_sse_try_free(http_sse_internal_s *sse) {
   if (fio_atomic_sub(&sse->ref, 1))
     return;
-  free(sse);
+  fio_free(sse);
 }
 
 static inline void http_sse_destroy(http_sse_internal_s *sse) {

data/ext/iodine/iodine.c

@@ -309,7 +309,7 @@ static VALUE iodine_cli_parse(VALUE self, VALUE desc) {
   }
   char **argv = calloc(argc, sizeof(*argv));
   FIO_ASSERT_ALLOC(argv);
-  argv[0] = "iodine";
+  argv[0] = (char *)"iodine";
   for (int i = 1; i < argc; ++i) {
     VALUE tmp = rb_ary_entry(ARGV, (long)(i - 1));
     if (TYPE(tmp) != T_STRING) {
@@ -326,13 +326,13 @@ static VALUE iodine_cli_parse(VALUE self, VALUE desc) {
   /* Levarage the facil.io CLI library */
   fio_cli_start(
       argc, (const char **)argv, 0, -1, StringValueCStr(desc),
-      "\x1B[1m\x1B[4mAddress Binding:\x1B[0m", FIO_CLI_TYPE_PRINT,
+      "\x1B[4mAddress Binding:\x1B[0m", FIO_CLI_TYPE_PRINT,
       "-bind -b -address address to listen to. defaults any available.",
       "-port -p port number to listen to. defaults port 3000", FIO_CLI_TYPE_INT,
-      "\n\x1B[1m\x1B[4mConcurrency:\x1B[0m", FIO_CLI_TYPE_PRINT,
+      "\n\x1B[4mConcurrency:\x1B[0m", FIO_CLI_TYPE_PRINT,
       "-workers -w number of processes to use.", FIO_CLI_TYPE_INT,
       "-threads -t number of threads per process.", FIO_CLI_TYPE_INT,
-      "\n\x1B[1m\x1B[4mHTTP Server:\x1B[0m", FIO_CLI_TYPE_PRINT,
+      "\n\x1B[4mHTTP Server:\x1B[0m", FIO_CLI_TYPE_PRINT,
       "-public -www public folder, for static file service.",
       "-log -v HTTP request logging.", FIO_CLI_TYPE_BOOL,
       "-keep-alive -k -tout HTTP keep-alive timeout (0..255). Default: 40s",
@@ -342,15 +342,14 @@ static VALUE iodine_cli_parse(VALUE self, VALUE desc) {
       FIO_CLI_TYPE_INT,
       "-max-header -maxhd header limit per HTTP request in Kb."
       " Default: 32Kb.",
-      FIO_CLI_TYPE_INT, "\n\x1B[1m\x1B[4mWebSocket Server:\x1B[0m",
-      FIO_CLI_TYPE_PRINT,
+      FIO_CLI_TYPE_INT, "\n\x1B[4mWebSocket Server:\x1B[0m", FIO_CLI_TYPE_PRINT,
       "-max-msg -maxms incoming WebSocket message limit in Kb. "
       "Default: 250Kb",
-      FIO_CLI_TYPE_INT, "\n\x1B[1m\x1B[4mConnecting Iodine to Redis:\x1B[0m",
+      FIO_CLI_TYPE_INT, "\n\x1B[4mConnecting Iodine to Redis:\x1B[0m",
       FIO_CLI_TYPE_PRINT,
       "-redis -r an optional Redis URL server address. Default: none.",
       "-redis-ping -rp websocket ping interval (0..255). Default: 5 minutes",
-      FIO_CLI_TYPE_INT, "\n\x1B[1m\x1B[4mMisc:\x1B[0m", FIO_CLI_TYPE_PRINT,
+      FIO_CLI_TYPE_INT, "\n\x1B[4mMisc:\x1B[0m", FIO_CLI_TYPE_PRINT,
       "-warmup warm up the application. CAREFUL! iodine might fork.",
       FIO_CLI_TYPE_BOOL,
       "-verbosity -V 0..5 server verbosity level. Default: 4",

data/ext/iodine/iodine_connection.c

@@ -250,7 +250,11 @@ static VALUE iodine_connection_pending(VALUE self) {
 }
 
 // clang-format off
-/** Returns the connection's protocol Symbol (`:sse`, `:websocket`, etc'), if originated in HTTP (`rack.upgrade`). */
+/**
+ * Returns the connection's protocol Symbol (`:sse`, `:websocket` or `:raw`).
+ *
+ * @Note For compatibility reasons (with ther `rack.upgrade` servers), it might be more prudent to use the data in the {#env} (`env['rack.upgrade?']`). However, this method is provided both as a faster alternative and for those cases where Raw / Custom (TCP/IP) data stream is a valid option.
+*/
 static VALUE iodine_connection_protocol_name(VALUE self) {
   // clang-format on
   iodine_connection_data_s *c = iodine_connection_validate_data(self);
@@ -334,14 +338,23 @@ static void iodine_on_pubsub(fio_msg_s *msg) {
   iodine_connection_data_s *data = msg->udata1;
   VALUE block = (VALUE)msg->udata2;
   switch (block) {
-  case Qnil: /* fallthrough */
-  case Qtrue: {
+  case Qnil:    /* fallthrough */
+  case Qtrue: { /* Qtrue == binary WebSocket */
     if (data->info.handler == Qnil || data->info.uuid == -1 ||
         fio_is_closed(data->info.uuid))
       return;
     switch (data->info.type) {
     case IODINE_CONNECTION_WEBSOCKET: {
-      websocket_write(data->info.arg, msg->msg, (block == Qnil));
+      FIOBJ s = (FIOBJ)fio_message_metadata(
+          msg, (block == Qnil ? WEBSOCKET_OPTIMIZE_PUBSUB
+                              : WEBSOCKET_OPTIMIZE_PUBSUB_BINARY));
+      if (s) {
+        // fwrite(".", 1, 1, stderr);
+        fiobj_send_free(data->info.uuid, fiobj_dup(s));
+      } else {
+        fwrite("-", 1, 1, stderr);
+        websocket_write(data->info.arg, msg->msg, (block == Qnil));
+      }
       return;
     }
     case IODINE_CONNECTION_SSE:
@@ -353,7 +366,20 @@ static void iodine_on_pubsub(fio_msg_s *msg) {
     }
   }
   default:
-    IodineCaller.enterGVL(iodine_on_pubsub_call_block, msg);
+    if (data->info.uuid != -1) {
+      fio_protocol_s *pr =
+          fio_protocol_try_lock(data->info.uuid, FIO_PR_LOCK_TASK);
+      if (!pr) {
+        // perror("Connection lock failed");
+        if (errno != EBADF)
+          fio_message_defer(msg);
+        break;
+      }
+      IodineCaller.enterGVL(iodine_on_pubsub_call_block, msg);
+      fio_protocol_unlock(pr, FIO_PR_LOCK_TASK);
+    } else {
+      IodineCaller.enterGVL(iodine_on_pubsub_call_block, msg);
+    }
     break;
   }
 }
@@ -364,7 +390,14 @@ static void iodine_on_unsubscribe(void *udata1, void *udata2) {
   VALUE block = (VALUE)udata2;
   switch (block) {
   case Qnil:
+    if (data && data->info.type == IODINE_CONNECTION_WEBSOCKET) {
+      websocket_optimize4broadcasts(WEBSOCKET_OPTIMIZE_PUBSUB, 0);
+    }
+    break;
   case Qtrue:
+    if (data && data->info.type == IODINE_CONNECTION_WEBSOCKET) {
+      websocket_optimize4broadcasts(WEBSOCKET_OPTIMIZE_PUBSUB_BINARY, 0);
+    }
     break;
   default:
     IodineStore.remove(block);
@@ -503,8 +536,15 @@ static VALUE iodine_pubsub_subscribe(int argc, VALUE *argv, VALUE self) {
       }
       return Qnil; /* cannot subscribe a closed / invalid connection. */
     }
-    if (args.block == Qnil && args.binary) {
-      args.block = Qtrue;
+    if (args.block == Qnil) {
+      if (c->info.type == IODINE_CONNECTION_WEBSOCKET)
+        websocket_optimize4broadcasts((args.binary
+                                           ? WEBSOCKET_OPTIMIZE_PUBSUB_BINARY
+                                           : WEBSOCKET_OPTIMIZE_PUBSUB),
+                                      1);
+      if (args.binary) {
+        args.block = Qtrue;
+      }
     }
     fio_atomic_add(&c->ref, 1);
   }
@@ -719,11 +759,11 @@ void iodine_connection_fire_event(VALUE connection,
       IodineCaller.call2(data->info.handler, on_close_id, 1, args);
     }
     fio_lock(&data->lock);
+    iodine_sub_clear_all(&data->subscriptions);
     data->info.handler = Qnil;
     data->info.env = Qnil;
     data->info.uuid = -1;
     data->info.arg = NULL;
-    iodine_sub_clear_all(&data->subscriptions);
     fio_unlock(&data->lock);
     IodineStore.remove(connection);
     break;

data/ext/iodine/iodine_defer.c

@@ -35,7 +35,7 @@ typedef struct {
 static void *iodine_io_thread(void *arg) {
   (void)arg;
   while (sock_io_thread_flag) {
-    if (fio_flush_all() > 1)
+    if (fio_flush_all())
       fio_throttle_thread(500000UL);
     else
       fio_throttle_thread(150000000UL);
@@ -101,11 +101,11 @@ static void *create_ruby_thread_gvl(void *args) {
 }
 
 static void *fork_using_ruby(void *ignr) {
-  // stop IO thread and call before_fork callbacks
+  // stop IO thread, if running (shouldn't occur)
   if (sock_io_pthread) {
     iodine_join_io_thread();
   }
-  // fork
+  // fork using Ruby
   const VALUE ProcessClass = rb_const_get(rb_cObject, rb_intern2("Process", 7));
   const VALUE rb_pid = IodineCaller.call(ProcessClass, rb_intern2("fork", 4));
   intptr_t pid = 0;
@@ -114,7 +114,7 @@ static void *fork_using_ruby(void *ignr) {
   } else {
     pid = 0;
   }
-  // manage post forking state
+  // manage post forking state for Iodine
   IodineCaller.set_GVL(1); /* enforce GVL state in thread storage */
   if (!pid) {
     IodineStore.after_fork();
@@ -376,7 +376,6 @@ static VALUE iodine_on_state(VALUE self, VALUE event) {
 /* Performs any cleanup before worker dies */
 static void iodine_defer_on_finish(void *ignr) {
   (void)ignr;
-
   iodine_join_io_thread();
 }
 
@@ -406,7 +405,8 @@ void iodine_defer_initialize(void) {
   STATE_START_SHUTDOWN = rb_intern("start_shutdown");
   STATE_ON_FINISH = rb_intern("on_finish");
 
+  /* start the IO thread is workrs (only starts in root if root is worker) */
+  fio_state_callback_add(FIO_CALL_ON_START, iodine_start_io_thread, NULL);
+  /* stop the IO thread before exit */
   fio_state_callback_add(FIO_CALL_ON_FINISH, iodine_defer_on_finish, NULL);
-  fio_state_callback_add(FIO_CALL_PRE_START, iodine_start_io_thread, NULL);
-  fio_state_callback_add(FIO_CALL_AFTER_FORK, iodine_start_io_thread, NULL);
 }