isomorfeus-iodine 0.8.0 → 0.8.2

data/Rakefile

@@ -27,7 +27,6 @@ task :push do
   system("git push github")
   system("git push gitlab")
   system("git push bitbucket")
-  system("git push gitprep")
 end
 
 task :default => [:compile, :spec]

data/examples/config.ru

@@ -1,56 +1,59 @@
-# This is a WebSocket / SSE notification broadcasting application.
-#
-# Running this application from the command line is easy with:
-#
-#      iodine
-#
-# Or, in single thread and single process:
-#
-#      iodine -t 1 -w 1
-#
-# 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' => '77' },
-   ['Please connect using WebSockets or SSE (send messages only 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 (WebsSocket / SSE).
-     if(env['rack.upgrade?'.freeze])
-       env['rack.upgrade'.freeze] = BroadcastClient
-       return WS_RESPONSE
-     end
-     # simply return the RESPONSE object, no matter what request was received.
-     HTTP_RESPONSE
-   end
-end
-
-# A simple Websocket Callback Object.
-module BroadcastClient
-  # seng a message to new clients.
-  def on_open client
-    client.subscribe :broadcast
-  end
-  # send a message, letting the client know the server is suggunt down.
-  def on_shutdown client
-    client.write "Server shutting down. Goodbye."
-  end
-  # perform the echo
-  def on_message client, data
-    client.publish :broadcast, data
-  end
-  extend self
-end
-
-# this function call links our HelloWorld application with Rack
-run MyHTTPRouter
+# This is a WebSocket / SSE notification broadcasting application.
+#
+# Running this application from the command line is easy with:
+#
+#      iodine
+#
+# Or, in single thread and single process:
+#
+#      iodine -t 1 -w 1
+#
+# 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/
+#
+# Test websocket echo using the browser. For example:
+#      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");};
+
+
+# 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' => '77' },
+   ['Please connect using WebSockets or SSE (send messages only 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 (WebsSocket / SSE).
+     if(env['rack.upgrade?'.freeze])
+       env['rack.upgrade'.freeze] = BroadcastClient
+       return WS_RESPONSE
+     end
+     # simply return the RESPONSE object, no matter what request was received.
+     HTTP_RESPONSE
+   end
+end
+
+# A simple Websocket Callback Object.
+module BroadcastClient
+  # seng a message to new clients.
+  def on_open client
+    client.subscribe :broadcast
+  end
+  # send a message, letting the client know the server is suggunt down.
+  def on_shutdown client
+    client.write "Server shutting down. Goodbye."
+  end
+  # perform the echo
+  def on_message client, data
+    client.publish :broadcast, data
+  end
+  extend self
+end
+
+# this function call links our HelloWorld application with Rack
+run MyHTTPRouter

data/examples/rack3.ru

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+# adjusted from the code suggested by @taku0 (GitHub issue #131)
+require 'rack'
+require 'iodine'
+
+run { |env|
+  response = Rack::Response.new(nil, 204)
+  response.set_cookie('aaa', 'aaa')
+  response.set_cookie('bbb', 'bbb')
+  response.finish
+}

data/exe/iodine

@@ -1,64 +1,64 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-IODINE_PARSE_CLI = true
-require 'iodine'
-
-# Load Rack if available (assume it will be used)
-
-require 'rack'
-
-module Iodine
-  # The Iodine::Base namespace is reserved for internal use and is NOT part of the public API.
-  module Base
-    # Command line interface. The Ruby CLI might be changed in future versions.
-    module CLI
-
-      def self.try_file filename
-        return nil unless File.exist? filename
-        ::Rack::Builder.parse_file filename
-      end
-
-      def self.get_app
-        app = nil
-        filename = Iodine::DEFAULT_SETTINGS[:filename_]
-        if filename
-          app = try_file filename
-          app = try_file "#{filename}.ru" unless app
-          unless app
-            puts "* Couldn't find #{filename}\n  testing for config.ru\n"
-            app = try_file "config.ru"
-          end
-        else
-          app = try_file "config.ru";
-        end
-        app
-      end
-
-      def self.perform_warmup(app)
-        # load anything marked with `autoload`, since autoload is niether thread safe nor fork friendly.
-        Iodine.on_state(:on_start) do
-          Module.constants.each do |n|
-            begin
-              Object.const_get(n)
-            rescue StandardError => _e
-            end
-          end
-          ::Rack::Builder.new(app) do |r|
-            r.warmup do |a|
-              client = ::Rack::MockRequest.new(a)
-              client.get('/')
-            end
-          end
-        end
-      end
-
-      def self.call
-        app = get_app
-        perform_warmup(app) if Iodine::DEFAULT_SETTINGS[:warmup_]
-        Iodine::Rack.run(app)
-      end
-    end
-  end
-end
-
-Iodine::Base::CLI.call
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+IODINE_PARSE_CLI = true
+require 'iodine'
+
+# Load Rack if available (assume it will be used)
+
+require 'rack'
+
+module Iodine
+  # The Iodine::Base namespace is reserved for internal use and is NOT part of the public API.
+  module Base
+    # Command line interface. The Ruby CLI might be changed in future versions.
+    module CLI
+
+      def self.try_file filename
+        return nil unless File.exist? filename
+        ::Rack::Builder.parse_file filename
+      end
+
+      def self.get_app
+        app = nil
+        filename = Iodine::DEFAULT_SETTINGS[:filename_]
+        if filename
+          app = try_file filename
+          app = try_file "#{filename}.ru" unless app
+          unless app
+            puts "* Couldn't find #{filename}\n  testing for config.ru\n"
+            app = try_file "config.ru"
+          end
+        else
+          app = try_file "config.ru";
+        end
+        app
+      end
+
+      def self.perform_warmup(app)
+        # load anything marked with `autoload`, since autoload is niether thread safe nor fork friendly.
+        Iodine.on_state(:on_start) do
+          Module.constants.each do |n|
+            begin
+              Object.const_get(n)
+            rescue StandardError => _e
+            end
+          end
+          ::Rack::Builder.new(app) do |r|
+            r.warmup do |a|
+              client = ::Rack::MockRequest.new(a)
+              client.get('/')
+            end
+          end
+        end
+      end
+
+      def self.call
+        app = get_app
+        perform_warmup(app) if Iodine::DEFAULT_SETTINGS[:warmup_]
+        Iodine::Rack.run(app)
+      end
+    end
+  end
+end
+
+Iodine::Base::CLI.call

data/ext/iodine_ext/extconf.rb

@@ -1,4 +1,5 @@
 require 'mkmf'
+require 'fileutils'
 
 WIN_PATTERNS = [
   /bccwin/i,

data/ext/iodine_ext/fio.c

@@ -155,7 +155,7 @@ int ioctl (int fd, u_long request, int* argp) {
   else { return 0; }
 }
 
-int kill(int pid, int sig) {
+int fio_kill(int pid, int sig) {
   /* Credit to Jan Biedermann (GitHub: @janbiedermann) */
   HANDLE handle;
   DWORD status;
@@ -987,7 +987,7 @@ FIO_FUNC void fio_thread_signal(void) {
     (void)r;
   } else if (fd == -1) {
     /* hardly the best way, but there's a thread sleeping on air */
-    kill(getpid(), SIGCONT);
+    fio_kill(getpid(), SIGCONT);
   }
 #endif
 }
@@ -1025,7 +1025,7 @@ static void fio_defer_thread_wait(void) {
     if (fio_defer_has_queue())
       pthread_setspecific(static_throttle_key, (void *)1);
     else if (static_throttle < FIO_DEFER_THROTTLE_LIMIT)
-      pthread_setspecific(static_throttle_key, (void *)(static_throttle << 1));
+      pthread_setspecific(static_throttle_key, (void *)((static_throttle << 1) | 1));
   }
 }
 
@@ -1654,7 +1654,7 @@ void fio_reap_children(void) {
   sa.sa_flags = SA_RESTART | SA_NOCLDSTOP;
   if (sigaction(SIGCHLD, &sa, &fio_old_sig_chld) == -1) {
     perror("Child reaping initialization failed");
-    kill(0, SIGINT);
+    fio_kill(0, SIGINT);
     exit(errno);
   }
 }
@@ -3689,7 +3689,8 @@ closed:
   return -1;
 
 flush_rw_hook:
-  flushed = uuid_data(uuid).rw_hooks->flush(uuid, uuid_data(uuid).rw_udata);
+  if(uuid_data(uuid).rw_hooks)
+    flushed = uuid_data(uuid).rw_hooks->flush(uuid, uuid_data(uuid).rw_udata);
   fio_unlock(&uuid_data(uuid).sock_lock);
   if (!flushed)
     return 0;
@@ -3749,7 +3750,8 @@ size_t fio_flush_all(void) {
     return 0;
   size_t count = 0;
   for (uintptr_t i = 0; i <= fio_data->max_protocol_fd; ++i) {
-    if ((fd_data(i).open || fd_data(i).packet) && fio_flush(fd2uuid(i)) > 0)
+    if ((fd_data(i).open || fd_data(i).packet) &&
+        fd_data(i).rw_hooks && fio_flush(fd2uuid(i)) > 0)
       ++count;
   }
   return count;
@@ -4603,7 +4605,7 @@ static void *fio_sentinel_worker_thread(void *arg) {
   if (child == -1) {
     FIO_LOG_FATAL("couldn't spawn worker.");
     perror("\n           errno");
-    kill(fio_parent_pid(), SIGINT);
+    fio_kill(fio_parent_pid(), SIGINT);
     fio_stop();
     return NULL;
   } else if (child) {
@@ -4617,7 +4619,7 @@ static void *fio_sentinel_worker_thread(void *arg) {
       } else {
         FIO_LOG_FATAL("Child worker (%d) shutdown. Stopping services.", child);
       }
-      kill(0, SIGINT);
+      fio_kill(0, SIGINT);
     }
 #else
     if (fio_data->active) {
@@ -6879,7 +6881,7 @@ static void fio_cluster_on_close(intptr_t uuid, fio_protocol_s *pr_) {
 #ifndef __MINGW32__
       fio_cluster_data_cleanup(1);
 #endif
-      kill(getpid(), SIGINT);
+      fio_kill(getpid(), SIGINT);
     }
   }
   if (c->msg)
@@ -7155,7 +7157,7 @@ static void fio_cluster_on_connect(intptr_t uuid, void *udata) {
 static void fio_cluster_on_fail(intptr_t uuid, void *udata) {
   FIO_LOG_FATAL("(facil.io) unknown cluster connection error");
   perror("       errno");
-  kill(fio_parent_pid(), SIGINT);
+  fio_kill(fio_parent_pid(), SIGINT);
   fio_stop();
   // exit(errno ? errno : 1);
   (void)udata;

data/ext/iodine_ext/fio.h

@@ -263,10 +263,12 @@ Version and helper macros
 #define pipe(fds) _pipe(fds, 65536, _O_BINARY)
 
 int fork(void);
-int kill(int, int);
+int fio_kill(int, int);
 ssize_t pread(int, void*, size_t, off_t);
 ssize_t pwrite(int, const void *, size_t, off_t);
 int fio_osffd4fd(unsigned int);
+#else
+#define fio_kill kill
 #endif
 
 /* *****************************************************************************
@@ -523,7 +525,7 @@ FIO_LOG2STDERR(const char *format, ...) {
   if (!(ptr)) {                                                                \
     FIO_LOG_FATAL("memory allocation error "__FILE__                           \
                   ":" FIO_MACRO2STR(__LINE__));                                \
-    kill(0, SIGINT);                                                           \
+    fio_kill(0, SIGINT);                                                           \
     exit(errno);                                                               \
   }
 #endif
@@ -6048,7 +6050,7 @@ FIO_NAME(_insert_or_overwrite_)(FIO_NAME(s) * set, FIO_SET_HASH_TYPE hash_value,
   pos->hash = hash_value;
   pos->pos->hash = hash_value;
   FIO_SET_COPY(pos->pos->obj, obj);
-  
+
   return pos->pos->obj;
 }
 

data/ext/iodine_ext/http.c

@@ -922,7 +922,7 @@ intptr_t http_listen(const char *port, const char *binding,
   if (arg_settings.on_request == NULL) {
     FIO_LOG_ERROR("http_listen requires the .on_request parameter "
                   "to be set\n");
-    kill(0, SIGINT);
+    fio_kill(0, SIGINT);
     exit(11);
   }