iodine 0.4.19 → 0.5.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.4.19
+  version: 0.5.0
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -129,6 +129,7 @@ files:
 - LIMITS.md
 - README.md
 - Rakefile
+- SPEC-PubSub-Draft.md
 - SPEC-Websocket-Draft.md
 - bin/config.ru
 - bin/console
@@ -149,116 +150,105 @@ files:
 - bin/updated api
 - bin/ws-broadcast
 - bin/ws-echo
-- bin/ws-shootout
-- examples/broadcast.ru
 - examples/config.ru
 - examples/echo.ru
 - examples/hello.ru
+- examples/info.md
+- examples/pubsub_engine.ru
 - examples/redis.ru
 - examples/shootout.ru
 - exe/iodine
-- ext/iodine/base64.c
-- ext/iodine/base64.h
-- ext/iodine/bscrypt-common.h
-- ext/iodine/bscrypt.h
 - ext/iodine/defer.c
 - ext/iodine/defer.h
 - ext/iodine/evio.c
 - ext/iodine/evio.h
+- ext/iodine/evio_callbacks.c
+- ext/iodine/evio_epoll.c
+- ext/iodine/evio_kqueue.c
 - ext/iodine/extconf.rb
 - ext/iodine/facil.c
 - ext/iodine/facil.h
-- ext/iodine/fio2resp.c
-- ext/iodine/fio2resp.h
-- ext/iodine/fio_cli_helper.c
-- ext/iodine/fio_cli_helper.h
-- ext/iodine/fio_dict.c
-- ext/iodine/fio_dict.h
-- ext/iodine/fio_hash_table.h
-- ext/iodine/fio_list.h
+- ext/iodine/fio_ary.h
+- ext/iodine/fio_base64.c
+- ext/iodine/fio_base64.h
+- ext/iodine/fio_cli.c
+- ext/iodine/fio_cli.h
+- ext/iodine/fio_hashmap.h
+- ext/iodine/fio_json_parser.h
+- ext/iodine/fio_llist.h
+- ext/iodine/fio_mem.c
+- ext/iodine/fio_mem.h
+- ext/iodine/fio_random.c
+- ext/iodine/fio_random.h
+- ext/iodine/fio_sha1.c
+- ext/iodine/fio_sha1.h
+- ext/iodine/fio_sha2.c
+- ext/iodine/fio_sha2.h
+- ext/iodine/fio_siphash.c
+- ext/iodine/fio_siphash.h
+- ext/iodine/fio_tmpfile.h
 - ext/iodine/fiobj.h
+- ext/iodine/fiobj4sock.h
 - ext/iodine/fiobj_ary.c
 - ext/iodine/fiobj_ary.h
+- ext/iodine/fiobj_data.c
+- ext/iodine/fiobj_data.h
 - ext/iodine/fiobj_hash.c
 - ext/iodine/fiobj_hash.h
-- ext/iodine/fiobj_internal.c
-- ext/iodine/fiobj_internal.h
 - ext/iodine/fiobj_json.c
 - ext/iodine/fiobj_json.h
 - ext/iodine/fiobj_numbers.c
 - ext/iodine/fiobj_numbers.h
-- ext/iodine/fiobj_primitives.c
-- ext/iodine/fiobj_primitives.h
 - ext/iodine/fiobj_str.c
 - ext/iodine/fiobj_str.h
-- ext/iodine/fiobj_sym.c
-- ext/iodine/fiobj_sym.h
 - ext/iodine/fiobject.c
 - ext/iodine/fiobject.h
-- ext/iodine/hex.c
-- ext/iodine/hex.h
 - ext/iodine/http.c
 - ext/iodine/http.h
 - ext/iodine/http1.c
 - ext/iodine/http1.h
 - ext/iodine/http1_parser.c
 - ext/iodine/http1_parser.h
-- ext/iodine/http1_request.c
-- ext/iodine/http1_request.h
-- ext/iodine/http1_response.c
-- ext/iodine/http1_response.h
-- ext/iodine/http_request.c
-- ext/iodine/http_request.h
-- ext/iodine/http_response.c
-- ext/iodine/http_response.h
+- ext/iodine/http_internal.c
+- ext/iodine/http_internal.h
+- ext/iodine/http_mime_parser.h
 - ext/iodine/iodine.c
 - ext/iodine/iodine.h
 - ext/iodine/iodine_helpers.c
 - ext/iodine/iodine_helpers.h
 - ext/iodine/iodine_http.c
 - ext/iodine/iodine_http.h
+- ext/iodine/iodine_json.c
+- ext/iodine/iodine_json.h
 - ext/iodine/iodine_protocol.c
 - ext/iodine/iodine_protocol.h
 - ext/iodine/iodine_pubsub.c
 - ext/iodine/iodine_pubsub.h
 - ext/iodine/iodine_websockets.c
 - ext/iodine/iodine_websockets.h
-- ext/iodine/misc.c
-- ext/iodine/misc.h
 - ext/iodine/pubsub.c
 - ext/iodine/pubsub.h
-- ext/iodine/random.c
-- ext/iodine/random.h
 - ext/iodine/rb-call.c
 - ext/iodine/rb-call.h
 - ext/iodine/rb-defer.c
+- ext/iodine/rb-fiobj2rb.h
 - ext/iodine/rb-rack-io.c
 - ext/iodine/rb-rack-io.h
 - ext/iodine/rb-registry.c
 - ext/iodine/rb-registry.h
-- ext/iodine/redis_connection.c
-- ext/iodine/redis_connection.h
 - ext/iodine/redis_engine.c
 - ext/iodine/redis_engine.h
-- ext/iodine/resp.c
-- ext/iodine/resp.h
-- ext/iodine/sha1.c
-- ext/iodine/sha1.h
-- ext/iodine/sha2.c
-- ext/iodine/sha2.h
-- ext/iodine/siphash.c
-- ext/iodine/siphash.h
+- ext/iodine/resp_parser.h
 - ext/iodine/sock.c
 - ext/iodine/sock.h
 - ext/iodine/spnlock.inc
 - ext/iodine/websocket_parser.h
 - ext/iodine/websockets.c
 - ext/iodine/websockets.h
-- ext/iodine/xor-crypt.c
-- ext/iodine/xor-crypt.h
 - iodine.gemspec
 - lib/iodine.rb
 - lib/iodine/cli.rb
+- lib/iodine/json.rb
 - lib/iodine/monkeypatch.rb
 - lib/iodine/protocol.rb
 - lib/iodine/pubsub.rb

data/bin/ws-shootout

@@ -1,107 +0,0 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.expand_path(File.join('..', '..'), __FILE__))
-puts `rake clean`
-puts `rake compile`
-
-require 'benchmark'
-require 'json'
-$LOAD_PATH.unshift File.expand_path(File.join('..', '..', 'lib'), __FILE__)
-require 'bundler/setup'
-require 'iodine'
-require 'rack'
-
-
-class ShootoutApp
-  # the default HTTP response
-  def self.call(env)
-    if env['upgrade.websocket?'.freeze] # && env['HTTP_UPGRADE'.freeze] =~ /websocket/i
-      env['upgrade.websocket'.freeze] = ShootoutApp.new
-      return [0, {}, []]
-    end
-    out = "ENV:\r\n#{env.to_a.map { |h| "#{h[0]}: #{h[1]}" } .join "\n"}\n"
-    request = Rack::Request.new(env)
-    out += "\nRequest Path: #{request.path_info}\nParams:\r\n#{request.params.to_a.map { |h| "#{h[0]}: #{h[1]}" } .join "\n"}\n" unless request.params.empty?
-    [200, { 'Content-Length' => out.length, 'Content-Type' => 'text/plain; charset=UTF-8;' }, [out]]
-  end
-  # we won't be using AutoDispatch, but directly using the `on_message` callback.
-  def on_message data
-    cmd, payload = JSON(data).values_at('type', 'payload')
-    if cmd == 'echo'
-      write({type: 'echo', payload: payload}.to_json)
-    else
-      msg = {type: 'broadcast', payload: payload}.to_json
-      # Iodine::Websocket.each {|ws| ws.write msg}
-      Iodine::Websocket.each_write(msg) # {|ws| true }
-      # each_write(msg) # {|ws| true }
-      # write msg
-      write({type: "broadcastResult", payload: payload}.to_json)
-    end
-  end
-end
-
-
-# create the server object and setup any settings we might need.
-Iodine.threads ||= 4
-Iodine.processes ||= 1
-Iodine::Rack.public = nil
-Iodine::Rack.app = ShootoutApp
-Iodine.start
-
-# websocket-bench broadcast ws://127.0.0.1:3000/ --concurrent 10 --sample-size 100 --step-size 1000 --limit-percentile 95 --limit-rtt 250ms --initial-clients 1000
-
-#
-# server.on_http= Proc.new do |env|
-#   # [200, {"Content-Length".freeze => "12".freeze}, ["Hello World!".freeze]];
-#   if env["HTTP_UPGRADE".freeze] =~ /websocket/i.freeze
-#     env['iodine.websocket'.freeze] = WSEcho.new
-#     [0,{}, []]
-#   else
-#     req = Rack::Request.new env
-#     res = Rack::Response.new
-#     res.write "Hello World!".freeze
-#     res.to_a
-#   end
-# end
-
-# server.on_start do
-#   server.run_every(1000) {puts "#{server.connection_count} clients connected."}
-# end
-
-# puts "Press enter to start (#{Process.pid})"
-# gets
-
-# 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/
-# ab -n 2000 -c 20 -H "Connection: close" http://127.0.0.1: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");};
-# };
-
-# sleep 10 while `websocket-bench broadcast ws://127.0.0.1:3000/ --concurrent 10 --sample-size 100 --step-size 1000 --limit-percentile 95 --limit-rtt 250ms --initial-clients 1000`.tap {|s| puts s; puts "zzz..."}

data/examples/broadcast.ru

@@ -1,56 +0,0 @@
-# This is a Websocket echo application.
-#
-# Running this application from the command line is eacy with:
-#
-#      iodine hello.ru
-#
-# Or, in single thread and single process:
-#
-#      iodine -t 1 -w 1 hello.ru
-#
-# Benchmark with `ab` or `wrk` (a 5 seconds benchmark with 2000 concurrent clients):
-#
-#      ab -c 2000 -t 5 -n 1000000 -k http://127.0.0.1:3000/
-#      wrk -c2000 -d5 -t12 http://localhost:3000/
-
-
-# A simple router - Checks for Websocket Upgrade and answers HTTP.
-module MyHTTPRouter
-  # This is the HTTP response object according to the Rack specification.
-  HTTP_RESPONSE = [200, { 'Content-Type' => 'text/html',
-          'Content-Length' => '32' },
-   ['Please connect using websockets.']]
-
-  WS_RESPONSE = [0, {}, []].freeze
-
-   # this is function will be called by the Rack server (iodine) for every request.
-   def self.call env
-     # check if this is an upgrade request.
-     if(env['upgrade.websocket?'.freeze])
-       env['upgrade.websocket'.freeze] = WebsocketBroadcast
-       return WS_RESPONSE
-     end
-     # simply return the RESPONSE object, no matter what request was received.
-     HTTP_RESPONSE
-   end
-end
-
-# A simple Websocket Callback Object.
-class WebsocketBroadcast
-  # seng a message to new clients.
-  def on_open
-    puts self
-    write "Welcome to our echo service!"
-  end
-  # send a message, letting the client know the server is suggunt down.
-  def on_shutdown
-    write "Server shutting down. Goodbye."
-  end
-  # perform the echo
-  def on_message data
-    write data
-  end
-end
-
-# this function call links our HelloWorld application with Rack
-run MyHTTPRouter

data/ext/iodine/bscrypt-common.h

@@ -1,116 +0,0 @@
-/*
-Copyright: Boaz segev, 2016-2017
-License: MIT except for any non-public-domain algorithms (none that I'm aware
-of), which might be subject to their own licenses.
-
-Feel free to copy, use and enjoy in accordance with to the license(s).
-*/
-#ifndef BSCRYPT_COMMON_H
-#define BSCRYPT_COMMON_H
-/* *****************************************************************************
-Environment - you can safely ignore this part... probably.
-*/
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-/* check for __uint128_t support */
-#if defined(__SIZEOF_INT128__) || defined(__SIZEOF_INT128__)
-#define HAS_UINT128
-#endif
-
-/* check for features used by lib-bscrypt using include file methology */
-#ifdef __has_include
-
-/* check for unix support */
-#if __has_include(<unistd.h>) && __has_include(<pthread.h>)
-#ifndef HAS_UNIX_FEATURES
-#define HAS_UNIX_FEATURES
-#endif
-#endif
-
-/* include intrinsics if supported */
-#if __has_include(<x86intrin.h>)
-#include <x86intrin.h>
-#define HAVE_X86Intrin
-/*
-see: https://software.intel.com/en-us/node/513411
-and: https://software.intel.com/sites/landingpage/IntrinsicsGuide/
-*/
-#endif /* __has_include(<x86intrin.h>) */
-
-#elif defined(__unix__) || defined(__linux__) || defined(__APPLE__)
-#ifndef HAS_UNIX_FEATURES
-#define HAS_UNIX_FEATURES
-#endif
-
-#endif /* __has_include */
-
-// clang-format off
-#if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)
-#   if defined(__has_include)
-#     if __has_include(<endian.h>)
-#      include <endian.h>
-#     elif __has_include(<sys/endian.h>)
-#      include <sys/endian.h>
-#     endif
-#   endif
-#   if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) && \
-                __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#      define __BIG_ENDIAN__
-#   endif
-#endif
-
-#ifndef UNUSED_FUNC
-#   define UNUSED_FUNC __attribute__((unused))
-#endif
-// clang-format on
-
-/* *****************************************************************************
-C++ extern
-*/
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/* ***************************************************************************
-Types commonly used by the bscrypt libraries
-*/
-
-typedef union {
-#ifdef HAVE_X86Intrin
-  __m128i mm;
-#endif
-#ifdef HAS_UINT128
-  __uint128_t i;
-#endif
-  uint8_t bytes[16];
-  uint8_t matrix[4][4];
-  uint32_t words_small[4];
-  uint64_t words[2];
-} bits128_u;
-
-typedef union {
-#if defined(HAVE_X86Intrin) && defined(__AVX__)
-  __m256i mm;
-#endif
-#ifdef HAS_UINT128
-  __uint128_t huge[2];
-#endif
-  uint8_t bytes[32];
-  uint8_t matrix[8][4];
-  uint32_t ints[8];
-  uint64_t words[4];
-} bits256_u;
-
-/* *****************************************************************************
-C++ extern finish
-*/
-#if defined(__cplusplus)
-}
-#endif
-
-#endif