iodine 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8b8c9242c96289b1e60cbf4e0ffe72c343ba468
-  data.tar.gz: 9334e2369ab360f6559f233ebb1be190232b4439
+  metadata.gz: 8def4f63c04685ba532ad67250a13099e9cc2a72
+  data.tar.gz: 9586665f6508a1fa66d2db4f62bfdd4fb5e20711
 SHA512:
-  metadata.gz: 8b1ce71015afc887cb0c748fe106774ea722884d58407b5d1a5836b1b6f0c60f05439afbc0508435aa89619d85e05723a2f802431c07bd659bc3663d603c9756
-  data.tar.gz: 8b38c0ecefb0b83a9bd5667a5f7403967e1e9fbbc984b9df990976a8071499bf9ec3f9b67cb65bfcc27a9bc728cc09e6b9e84cfbfe32c0a1e536f457df338e6e
+  metadata.gz: b2c1d1a6e6fab1cc794ac8e8148b171fa774a7c7c06055b67ccd6cfbd58da83a005f9abb8b1726e555404fe1baee9031ad73c8d5aa9b7d4660e5e2de87a38102
+  data.tar.gz: 2126c8d8c4e370b042909b1e0c376bdbddf9d68a128894b1a2040652b96aac2e287714d755cb815b1dc0d2e0d52b50943af4ae40b75b06107c7586bf25d30a08

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.4.11
+
+**Fix**: (`iodine`) use Ruby `fork` instead of system `fork`, allowing Ruby hooks to run before and after forking. This also fixes an issue where the Ruby timer thread isn't (re)initialized.
+
 #### Change log v.0.4.10
 
 **Portability**: (`mac OS High Sierra`) iodine will load the Objective C library on macOS machines before starting up the server - this will prevent `fork` from crashing the server on macOS High Sierra, see [discussion here](https://github.com/puma/puma/issues/1421).

data/ext/iodine/defer.c

@@ -270,6 +270,15 @@ pool_pt defer_pool_start(unsigned int thread_count) {
 Child Process support (`fork`)
 ***************************************************************************** */
 
+/**
+OVERRIDE THIS to replace the default `fork` implementation or to inject hooks
+into the forking function.
+
+Behaves like the system's `fork`.
+*/
+#pragma weak defer_new_child
+int defer_new_child(void) { return (int)fork(); }
+
 /* forked `defer` workers use a global thread pool object. */
 static pool_pt forked_pool;
 
@@ -367,7 +376,7 @@ int defer_perform_in_fork(unsigned int process_count,
   if (process_count && !pids)
     goto finish;
   for (pids_count = 0; pids_count < process_count; pids_count++) {
-    if (!(pids[pids_count] = fork())) {
+    if (!(pids[pids_count] = (pid_t)defer_new_child())) {
       defer_fork_pid_id = pids_count + 1;
       forked_pool = &pool_placeholder;
       forked_pool = defer_pool_start(thread_count);

data/ext/iodine/defer.h

@@ -91,6 +91,14 @@ void defer_thread_throttle(unsigned long microsec);
 Child Process support (`fork`)
 ***************************************************************************** */
 
+/**
+OVERRIDE THIS to replace the default `fork` implementation or to inject hooks
+into the forking function.
+
+Behaves like the system's `fork`.
+*/
+int defer_new_child(void);
+
 /**
  * Forks the process, starts up a thread pool and waits for all tasks to run.
  * All existing tasks will run in all processes (multiple times).

data/ext/iodine/rb-defer.c

@@ -8,6 +8,8 @@ Feel free to copy, use and enjoy according to the license provided.
 #include "rb-registry.h"
 #include <ruby.h>
 #include <ruby/thread.h>
+
+#include <stdint.h>
 // clang-format on
 
 #include "defer.h"
@@ -41,10 +43,18 @@ static void *create_ruby_thread_gvl(void *args) {
 }
 
 /* protect the call to join from any exceptions */
-static void *_inner_join_with_rbthread(void *rbt) {
+static void *inner_join_with_rbthread_(void *rbt) {
   return (void *)rb_funcall((VALUE)rbt, rb_intern("join"), 0);
 }
 
+static void *fork_using_ruby(void *ignr) {
+  const VALUE ProcessClass = rb_const_get(rb_cObject, rb_intern("Process"));
+  const VALUE pid = rb_funcall(ProcessClass, rb_intern("fork"), 0);
+  if (pid == Qnil)
+    return (void *)0;
+  return (void *)(intptr_t)(NUM2INT(pid));
+}
+
 /* *****************************************************************************
 The Defer library overriding functions
 ***************************************************************************** */
@@ -69,7 +79,18 @@ OVERRIDE THIS to replace the default pthread implementation.
 int defer_join_thread(void *thr) {
   if (!thr || (VALUE)thr == Qfalse || (VALUE)thr == Qnil)
     return -1;
-  rb_thread_call_with_gvl(_inner_join_with_rbthread, (void *)thr);
+  rb_thread_call_with_gvl(inner_join_with_rbthread_, (void *)thr);
   Registry.remove((VALUE)thr);
   return 0;
 }
+
+/**
+OVERRIDE THIS to replace the default `fork` implementation or to inject hooks
+into the forking function.
+
+Behaves like the system's `fork`.
+*/
+int defer_new_child(void) {
+  intptr_t pid = (intptr_t)rb_thread_call_with_gvl(fork_using_ruby, NULL);
+  return (int)pid;
+}

data/ext/iodine/websocket_parser.h

@@ -18,13 +18,6 @@ must be implemented by the including file (the callbacks).
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-/* *****************************************************************************
-API - Internal Helpers
-***************************************************************************** */
-
-/** used internally to mask and unmask client messages. */
-inline static void websocket_xmask(void *msg, uint64_t len, uint32_t mask);
-
 /* *****************************************************************************
 API - Message Wrapping
 ***************************************************************************** */
@@ -124,13 +117,20 @@ websocket_buffer_peek(void *buffer, uint64_t len);
  *
  * Returns the remaining data in the existing buffer (can be 0).
  *
- * Notice: if there's any remaining data in the buffer, `memmove` is used to
- * place the data at the begining of the buffer.
+ * Notice: if there's any data in the buffer that can't be parsed
+ * just yet, `memmove` is used to place the data at the begining of the buffer.
  */
 inline static __attribute__((unused)) uint64_t
 websocket_consume(void *buffer, uint64_t len, void *udata,
                   uint8_t require_masking);
 
+/* *****************************************************************************
+API - Internal Helpers
+***************************************************************************** */
+
+/** used internally to mask and unmask client messages. */
+inline static void websocket_xmask(void *msg, uint64_t len, uint32_t mask);
+
 /* *****************************************************************************
 
                                 Implementation
@@ -330,14 +330,16 @@ Message unwrapping
  */
 inline static struct websocket_packet_info_s
 websocket_buffer_peek(void *buffer, uint64_t len) {
-  if (len < 2)
+  if (len < 2) {
     return (struct websocket_packet_info_s){0, 2, 0};
+  }
   const uint8_t mask_f = (((uint8_t *)buffer)[1] >> 7) & 1;
   const uint8_t mask_l = (mask_f << 2);
   uint8_t len_indicator = (((uint8_t *)buffer)[1] & 127);
-  if (len < 126)
+  if (len < 126) {
     return (struct websocket_packet_info_s){len_indicator,
                                             (uint8_t)(2 + mask_l), mask_f};
+  }
   switch (len_indicator) {
   case 126:
     if (len < 4)

data/iodine.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Boaz Segev']
   spec.email         = ['bo@plezi.io']
 
-  spec.summary       = 'iodine - HTTP / Websocket Server with Pub/Sub support, optimized for Ruby MRI on Linux / BSD'
-  spec.description   = 'iodine - HTTP / Websocket Server with Pub/Sub support, optimized for Ruby MRI on Linux / BSD'
+  spec.summary       = 'iodine - a fast HTTP / Websocket Server with Pub/Sub support, optimized for Ruby MRI on Linux / BSD'
+  spec.description   = 'A fast HTTP / Websocket Server with built-in Pub/Sub support (with or without Redis), static file support and many other features, optimized for Ruby MRI on Linux / BSD / macOS'
   spec.homepage      = 'https://github.com/boazsegev/iodine'
   spec.license       = 'MIT'
 
@@ -31,17 +31,17 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.2.2' # Because earlier versions had been discontinued
 
-  spec.add_dependency 'rack'
+  spec.add_dependency 'rack', '>= 1.0', '< 3.0'
 
   spec.requirements << 'A Unix based system: Linux / macOS / BSD.'
   spec.requirements << 'An updated C compiler.'
   spec.requirements << 'Ruby >= 2.2.2 required for Rack 2.'
   spec.requirements << 'Ruby >= 2.4.0 recommended.'
 
-  spec.add_development_dependency 'bundler', '>= 1.10'
-  spec.add_development_dependency 'rake', '~> 12.0'
-  spec.add_development_dependency 'minitest', '>=5'
-  spec.add_development_dependency 'rake-compiler', '>= 1'
+  spec.add_development_dependency 'bundler', '>= 1.10', '< 2.0'
+  spec.add_development_dependency 'rake', '~> 12.0', '< 13.0'
+  spec.add_development_dependency 'minitest', '>=5', '< 6.0'
+  spec.add_development_dependency 'rake-compiler', '>= 1', '< 2.0'
 
   # spec.post_install_message = "** WARNING!\n" \
   #                             "Iodine 0.2.0 is NOT an upgrade - it's a total rewrite, it's written in C specifically for Ruby MRI.\n\n" \

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '0.4.10'.freeze
+  VERSION = '0.4.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-19 00:00:00.000000000 Z
+date: 2017-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +37,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +47,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +57,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +67,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +77,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,6 +87,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +97,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,8 +107,12 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1'
-description: iodine - HTTP / Websocket Server with Pub/Sub support, optimized for
-  Ruby MRI on Linux / BSD
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+description: A fast HTTP / Websocket Server with built-in Pub/Sub support (with or
+  without Redis), static file support and many other features, optimized for Ruby
+  MRI on Linux / BSD / macOS
 email:
 - bo@plezi.io
 executables:
@@ -259,6 +290,6 @@ rubyforge_project:
 rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: iodine - HTTP / Websocket Server with Pub/Sub support, optimized for Ruby
-  MRI on Linux / BSD
+summary: iodine - a fast HTTP / Websocket Server with Pub/Sub support, optimized for
+  Ruby MRI on Linux / BSD
 test_files: []