iodine 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94ddb42ee5c0ca01c01a252da1a13889165f6bfc
-  data.tar.gz: 701269ce567cd8c0206a0503d9c75764788bddee
+  metadata.gz: de923f79329ea2c150786d10000b43b6378612e3
+  data.tar.gz: 97749ca95384e2e5b0487c4bfda183690440257c
 SHA512:
-  metadata.gz: 7e6ff2fe5ac88b5343b33df08ed0c21833e48a1c49f83603dd899b78fa3ec73b3a681268bf71d321c4d15248fec25b46db6a2eba7d2fba992c8478132e4f0d8b
-  data.tar.gz: 8b8e9b38b31b14b68f247eedef46eae9adf9d3a3de9c2be9d997e327508e9b83077ab9d9bf015f62a08e053c92e7e3beba8d4a5bc7c16218732792b684eb7e89
+  metadata.gz: 40b2d878c483d077421eab48b4be2b02f6c3bb1ebf32cd43c9fc6007fdae110828df6b6d02867d54bf6ae524e3762dd8d9f95277712038a64e1727f00e3a1153
+  data.tar.gz: 289d7f82bd5f2a67621ada01dfc56143ba62c5dbeafcd0b4c5a544a9ba7c992b2c4dff5322b7b0fe21e656f3b9913716d8b523d0c708325028c54fc2a2cfa0bf

data/CHANGELOG.md

@@ -8,6 +8,12 @@ Please notice that this change log contains changes for upcoming releases as wel
 
 ***
 
+#### Change log v.0.2.17
+
+**Performance**: Enhanced Performance for single threaded / blocking applications by adding a dedicated IO thread. This is related to issue #14.
+
+***
+
 #### Change log v.0.2.16
 
 **Update**: iodine can now run as a basic HTTP static file server without a Ruby application (no `config.ru`) when the `-www` option is used from the command line.

data/README.md

@@ -24,7 +24,7 @@ Iodine is a C extension for Ruby, developed for Ruby MRI 2.2.2 and up... it shou
 
 ## Iodine::Rack - an HTTP and Websockets server
 
-Iodine includes a light and fast HTTP and Websocket server written in C that was written according to the [Rack interface specifications](http://www.rubydoc.info/github/rack/rack/master/file/SPEC) and the Websocket draft extension.
+Iodine includes a light and fast HTTP and Websocket server written in C that was written according to the [Rack interface specifications](http://www.rubydoc.info/github/rack/rack/master/file/SPEC) and the [Websocket draft extension](./SPEC-Websocket-Draft.md).
 
 ### Running the web server
 

data/bin/config.ru

@@ -8,7 +8,7 @@ require 'rack/lint'
 # This value (app) sets which of the different applications will run.
 #
 # Valid values are "hello", "slow" (debugs env values), "simple"
-app = 'hello'
+app = 'big'
 # This is a simple Hello World Rack application, for benchmarking.
 HELLO_RESPONSE = [200, { 'Content-Type'.freeze => 'text/html'.freeze,
         'Content-Length'.freeze => '16'.freeze }.freeze,
@@ -48,12 +48,20 @@ simple = proc do |env|
  end
 end
 
+logo_png = nil
+big = proc do |_env|
+  logo_png ||= IO.binread '../logo.png'
+  [200, { 'Content-Length'.freeze => logo_png.length.to_s , 'Content-Type'.freeze => 'image/png'.freeze}, [logo_png]]
+end
+
 case app
 when 'simple'
   use Rack::Sendfile
   run simple
 when 'hello'
   run hello
+when 'big'
+  run big
 when 'slow'
   use Rack::Lint
   run slow

data/bin/http-big

@@ -0,0 +1,63 @@
+#!/usr/bin/env ruby
+
+# this will compile Iodine and run an HTTP server "Hello World" example.
+Dir.chdir(File.expand_path(File.join('..', '..'), __FILE__))
+puts `rake clean`
+puts `rake compile`
+
+require 'benchmark'
+$LOAD_PATH.unshift File.expand_path(File.join('..', '..', 'lib'), __FILE__)
+require 'bundler/setup'
+require 'iodine'
+require 'rack'
+
+# create the server object and setup any settings we might need.
+Iodine::Rack
+Iodine.threads ||= 1
+Iodine.processes ||= 1 # 4
+Iodine::Rack.public = '~/Documents/Scratch'
+count = 2
+logo_png = IO.binread './logo.png'
+Iodine::Rack.app = proc { |_env| [200, { 'Content-Length'.freeze => logo_png.length.to_s , 'Content-Type'.freeze => 'image/png'.freeze}, [logo_png]] }
+puts Iodine::Rack.address
+Iodine.start
+
+# puts env.to_a.map { |pair| pair.join(': ') } .join("\n").to_s;
+
+# puts "Press enter to start (#{Process.pid})"
+# gets
+
+###############
+## for testing:
+
+# def nag
+#   puts `ab -n 200000 -c 2000 -k http://127.0.0.1:3000/`
+#   sleep 2
+# end
+#
+# nag while true
+#
+# def nag
+#   puts `wrk -c2000 -d10 -t4 http://localhost:3000/`
+#   sleep 3
+# end
+#
+# nag while true
+
+# ab -n 100000 -c 200 -k http://127.0.0.1:3000/
+# ab -n 100000 -c 4000 -k http://127.0.0.1:3000/
+# ab -n 1000000 -c 20000 -k http://127.0.0.1:3000/
+# ~/ruby/wrk/wrk -c400 -d10 -t12 http://localhost:3000/
+# wrk -c200 -d4 -t12 http://localhost:3000/
+# RACK_ENV="production" rackup -p 3000 -s iodine
+
+# thor --amount 5000 ws://localhost:3000/echo
+# thor --amount 5000 ws://localhost:3000/broadcast
+
+# ws = new WebSocket("ws://localhost:3000"); ws.onmessage = function(e) {console.log("Got message!"); console.log(e.data);}; ws.onclose = function(e) {console.log("closed")}; ws.onopen = function(e) {ws.send("hi");};
+# for(i = 0; i< 256; i++) {
+#   ws = new WebSocket("ws://localhost:3000");
+#   ws.onmessage = function(e) {console.log("Got message!"); console.log(e.data); e.target.close(); };
+#   ws.onclose = function(e) {console.log("closed")};
+#   ws.onopen = function(e) {e.target.send("hi");};
+# };

data/exe/iodine

@@ -22,8 +22,9 @@ Available options:
  -v          Log responses.
  -q          Never log responses.
  -warmup     Warmup invokes autoloading (lazy loading) during server startup.
- -maxbd      Maximum Mb per HTTP message (max body size). Default: ~50Mb.
- -maxms      Maximum Bytes per Websocket message. Default: ~250Kb.
+ -tout       HTTP inactivity connection timeout. Default: 5.
+ -maxbd      Maximum Mb per HTTP message (max body size). Default: 50Mib.
+ -maxms      Maximum Bytes per Websocket message. Default: 250Kib.
  -ping       Websocket ping interval in seconds. Default: 40 seconds.
  <filename>  Defaults to: config.ru
 
@@ -72,6 +73,10 @@ end
 if ARGV.index('-www') && ARGV[ARGV.index('-www') + 1]
   Iodine::Rack.public = ARGV[ARGV.index('-www') + 1]
 end
+if ARGV.index('-tout') && ARGV[ARGV.index('-tout') + 1]
+  Iodine::Rack.timeout = ARGV[ARGV.index('-tout') + 1].to_i
+  puts "WARNNING: Iodine::Rack.timeout set to 0 (ignored, timeout will be ~5 minutes)."
+end
 Iodine::Rack.log = true if ARGV.index('-v')
 Iodine::Rack.log = false if ARGV.index('-q')
 Iodine.warmup if ARGV.index('-warmup')

data/ext/iodine/iodine_core.c

@@ -189,7 +189,7 @@ static void dyn_perform_defer(intptr_t uuid, protocol_s *protocol, void *arg) {
 static void dyn_defer_fallback(intptr_t uuid, void *arg) {
   (void)(uuid);
   Registry.remove((VALUE)arg);
-};
+}
 
 /**
 Runs the required block later (defers the blocks execution).
@@ -326,7 +326,7 @@ static VALUE default_on_data(VALUE self) {
     if (!RSTRING_LEN(buff))
       return Qnil;
     rb_funcall(self, on_message_func_id, 1, buff);
-  } while (RSTRING_LEN(buff) == rb_str_capacity(buff));
+  } while (RSTRING_LEN(buff) == (ssize_t)rb_str_capacity(buff));
   return Qnil;
 }
 
@@ -603,6 +603,21 @@ static VALUE iodine_count(VALUE self) {
 /* *****************************************************************************
 Running the server
 */
+static int sock_io_thread = 0;
+static void *iodine_io_thread(void *arg) {
+  (void)arg;
+  static const struct timespec tm = {.tv_nsec = 16777216UL};
+  while (sock_io_thread) {
+    sock_flush_all();
+    nanosleep(&tm, NULL);
+  }
+  return NULL;
+}
+
+static void iodine_start_io_thread(void) {
+  pthread_t io_thread;
+  pthread_create(&io_thread, NULL, iodine_io_thread, NULL);
+}
 
 static void *srv_start_no_gvl(void *_) {
   (void)(_);
@@ -619,16 +634,17 @@ static void *srv_start_no_gvl(void *_) {
   if (threads <= 0)
     threads = (cpu_count >> 1) ? (cpu_count >> 1) : 1;
 
-  if (cpu_count > 0 &&
-      ((processes << 1) < cpu_count || processes > (cpu_count << 1)))
+  if (cpu_count > 0 && (((size_t)processes << 1) < cpu_count ||
+                        (size_t)processes > (cpu_count << 1)))
     fprintf(
-        stderr, "* Performance warnning:\n"
-                "  - This computer has %lu CPUs available and you'll be "
-                "utilizing %lu processes.\n  - %s\n"
-                "  - Use the command line option: `-w %lu`\n"
-                "  - Or, within Ruby: `Iodine.processes = %lu`\n",
+        stderr,
+        "* Performance warnning:\n"
+        "  - This computer has %lu CPUs available and you'll be "
+        "utilizing %lu processes.\n  - %s\n"
+        "  - Use the command line option: `-w %lu`\n"
+        "  - Or, within Ruby: `Iodine.processes = %lu`\n",
         cpu_count, (processes ? processes : 1),
-        (processes < cpu_count
+        ((size_t)processes < cpu_count
              ? "Some CPUs won't be utilized, inhibiting performance."
              : "This causes excessive context switches, wasting resources."),
         cpu_count, cpu_count);
@@ -638,7 +654,10 @@ static void *srv_start_no_gvl(void *_) {
   if (threads <= 0)
     threads = 1;
 #endif
-  server_run(.threads = threads, .processes = processes);
+  sock_io_thread = 1;
+  server_run(.threads = threads, .processes = processes,
+             .on_init = iodine_start_io_thread);
+  sock_io_thread = 0;
   return NULL;
 }
 

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '0.2.16'.freeze
+  VERSION = '0.2.17'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-17 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -100,6 +100,7 @@ files:
 - bin/config.ru
 - bin/console
 - bin/echo
+- bin/http-big
 - bin/http-hello
 - bin/http-playground
 - bin/playground
@@ -202,7 +203,7 @@ requirements:
 - Ruby >= 2.2.2 required for Rack.
 - Ruby >= 2.3.0 recommended.
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Iodine - leveraging C for Ruby servers.