nio4r 1.1.0 → 1.1.1

data/ext/libev/ev.h

@@ -1,7 +1,7 @@
 /*
  * libev native API header
  *
- * Copyright (c) 2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann <libev@schmorp.de>
+ * Copyright (c) 2007,2008,2009,2010,2011,2012,2015 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modifica-
@@ -42,12 +42,16 @@
 
 #ifdef __cplusplus
 # define EV_CPP(x) x
+# if __cplusplus >= 201103L
+#  define EV_THROW noexcept
+# else
+#  define EV_THROW throw ()
+# endif
 #else
 # define EV_CPP(x)
+# define EV_THROW
 #endif
 
-#define EV_THROW EV_CPP(throw())
-
 EV_CPP(extern "C" {)
 
 /*****************************************************************************/
@@ -148,6 +152,8 @@ EV_CPP(extern "C" {)
 
 typedef double ev_tstamp;
 
+#include <string.h> /* for memmove */
+
 #ifndef EV_ATOMIC_T
 # include <signal.h>
 # define EV_ATOMIC_T sig_atomic_t volatile
@@ -205,7 +211,7 @@ struct ev_loop;
 /*****************************************************************************/
 
 #define EV_VERSION_MAJOR 4
-#define EV_VERSION_MINOR 19
+#define EV_VERSION_MINOR 20
 
 /* eventmask, revents, events... */
 enum {
@@ -660,7 +666,7 @@ EV_API_DECL void ev_set_userdata (EV_P_ void *data) EV_THROW;
 EV_API_DECL void *ev_userdata (EV_P) EV_THROW;
 typedef void (*ev_loop_callback)(EV_P);
 EV_API_DECL void ev_set_invoke_pending_cb (EV_P_ ev_loop_callback invoke_pending_cb) EV_THROW;
-/* C++ doesn't allow the use of the ev_loop_callback typedef here, so we need to spell it out*/
+/* C++ doesn't allow the use of the ev_loop_callback typedef here, so we need to spell it out */
 EV_API_DECL void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P) EV_THROW, void (*acquire)(EV_P) EV_THROW) EV_THROW;
 
 EV_API_DECL unsigned int ev_pending_count (EV_P) EV_THROW; /* number of pending events, if any */
@@ -715,7 +721,8 @@ EV_API_DECL void ev_resume  (EV_P) EV_THROW;
 #define ev_is_pending(ev)                    (0 + ((ev_watcher *)(void *)(ev))->pending) /* ro, true when watcher is waiting for callback invocation */
 #define ev_is_active(ev)                     (0 + ((ev_watcher *)(void *)(ev))->active) /* ro, true when the watcher has been started */
 
-#define ev_cb(ev)                            (ev)->cb /* rw */
+#define ev_cb_(ev)                           (ev)->cb /* rw */
+#define ev_cb(ev)                            (memmove (&ev_cb_ (ev), &((ev_watcher *)(ev))->cb, sizeof (ev_cb_ (ev))), (ev)->cb)
 
 #if EV_MINPRI == EV_MAXPRI
 # define ev_priority(ev)                     ((ev), EV_MINPRI)
@@ -728,7 +735,7 @@ EV_API_DECL void ev_resume  (EV_P) EV_THROW;
 #define ev_periodic_at(ev)                   (+((ev_watcher_time *)(ev))->at)
 
 #ifndef ev_set_cb
-# define ev_set_cb(ev,cb_)                   ev_cb (ev) = (cb_)
+# define ev_set_cb(ev,cb_)                   (ev_cb_ (ev) = (cb_), memmove (&((ev_watcher *)(ev))->cb, &ev_cb_ (ev), sizeof (ev_cb_ (ev))))
 #endif
 
 /* stopping (enabling, adding) a watcher does nothing if it is already running */

data/ext/nio4r/extconf.rb

@@ -1,52 +1,41 @@
-require 'mkmf'
+require "mkmf"
 
-if have_func('rb_thread_blocking_region')
-  $defs << '-DHAVE_RB_THREAD_BLOCKING_REGION'
-end
+have_header("unistd.h")
 
-if have_func('rb_thread_call_without_gvl')
-  $defs << '-DHAVE_RB_THEREAD_CALL_WITHOUT_GVL'
+if have_func("rb_thread_blocking_region")
+  $defs << "-DHAVE_RB_THREAD_BLOCKING_REGION"
 end
 
-if have_header('sys/select.h')
-  $defs << '-DEV_USE_SELECT'
+if have_func("rb_thread_call_without_gvl")
+  $defs << "-DHAVE_RB_THEREAD_CALL_WITHOUT_GVL"
 end
 
-if have_header('poll.h')
-  $defs << '-DEV_USE_POLL'
-end
+$defs << "-DEV_USE_SELECT" if have_header("sys/select.h")
 
-if have_header('sys/epoll.h')
-  $defs << '-DEV_USE_EPOLL'
-end
+$defs << "-DEV_USE_POLL" if have_header("poll.h")
 
-if have_header('sys/event.h') and have_header('sys/queue.h')
-  $defs << '-DEV_USE_KQUEUE'
-end
+$defs << "-DEV_USE_EPOLL" if have_header("sys/epoll.h")
 
-if have_header('port.h')
-  $defs << '-DEV_USE_PORT'
+if have_header("sys/event.h") && have_header("sys/queue.h")
+  $defs << "-DEV_USE_KQUEUE"
 end
 
-if have_header('sys/resource.h')
-  $defs << '-DHAVE_SYS_RESOURCE_H'
-end
+$defs << "-DEV_USE_PORT" if have_header("port.h")
 
-if RUBY_VERSION.to_f < 1.9
-  $defs << '-DHAVE_RUBYSIG_H'
-end
+$defs << "-DHAVE_SYS_RESOURCE_H" if have_header("sys/resource.h")
+
+$defs << "-DHAVE_RUBYSIG_H" if RUBY_VERSION.to_f < 1.9
 
-dir_config 'nio4r_ext'
-create_makefile 'nio4r_ext'
+dir_config "nio4r_ext"
+create_makefile "nio4r_ext"
 
-# win32 needs to link in "just the right order" for some reason or ioctlsocket will be mapped to an [inverted] ruby specific version.
-# See libev mailing list for (not so helpful discussion--true cause I'm not sure, but this overcomes the symptom)
+# win32 needs to link in "just the right order" for some reason or
+# ioctlsocket will be mapped to an [inverted] ruby specific version.
 if RUBY_PLATFORM =~ /mingw|win32/
-  makefile_contents = File.read 'Makefile'
+  makefile_contents = File.read "Makefile"
 
-  # "Init_cool could not be found" when loading cool.io.so.
-  makefile_contents.gsub! 'DLDFLAGS = ', 'DLDFLAGS = -export-all '
+  makefile_contents.gsub! "DLDFLAGS = ", "DLDFLAGS = -export-all "
 
-  makefile_contents.gsub! 'LIBS = $(LIBRUBYARG_SHARED)', 'LIBS = -lws2_32 $(LIBRUBYARG_SHARED)'
-  File.open('Makefile', 'w') { |f| f.write makefile_contents }
+  makefile_contents.gsub! "LIBS = $(LIBRUBYARG_SHARED)", "LIBS = -lws2_32 $(LIBRUBYARG_SHARED)"
+  File.open("Makefile", "w") { |f| f.write makefile_contents }
 end

data/ext/nio4r/selector.c

@@ -7,7 +7,13 @@
 #ifdef HAVE_RUBYSIG_H
 # include "rubysig.h"
 #endif
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#else
+#include <io.h>
+#endif
+
 #include <fcntl.h>
 #include <assert.h>
 

data/lib/nio.rb

@@ -1,6 +1,6 @@
-require 'thread'
-require 'socket'
-require 'nio/version'
+require "thread"
+require "socket"
+require "nio/version"
 
 # New I/O for Ruby
 module NIO
@@ -8,22 +8,24 @@ module NIO
   # * select: in pure Ruby using Kernel.select
   # * libev: as a C extension using libev
   # * java: using Java NIO
-  def self.engine; ENGINE end
+  def self.engine
+    ENGINE
+  end
 end
 
-if ENV["NIO4R_PURE"] || (Gem.win_platform? && !defined?(JRUBY_VERSION))
-  require 'nio/monitor'
-  require 'nio/selector'
-  NIO::ENGINE = 'select'
+if ENV["NIO4R_PURE"] == "true" || (Gem.win_platform? && !defined?(JRUBY_VERSION))
+  require "nio/monitor"
+  require "nio/selector"
+  NIO::ENGINE = "ruby"
 else
-  require 'nio4r_ext'
+  require "nio4r_ext"
 
   if defined?(JRUBY_VERSION)
-    require 'java'
-    require 'jruby'
+    require "java"
+    require "jruby"
     org.nio4r.Nio4r.new.load(JRuby.runtime, false)
-    NIO::ENGINE = 'java'
+    NIO::ENGINE = "java"
   else
-    NIO::ENGINE = 'libev'
+    NIO::ENGINE = "libev"
   end
 end

data/lib/nio/monitor.rb

@@ -13,11 +13,13 @@ module NIO
           io = io.to_io
         end
 
-        raise TypeError, "can't convert #{io.class} into IO" unless io.is_a? IO
+        fail TypeError, "can't convert #{io.class} into IO" unless io.is_a? IO
       end
 
-      @io, @interests, @selector = io, interests, selector
-      @closed = false
+      @io        = io
+      @interests = interests
+      @selector  = selector
+      @closed    = false
     end
 
     # Is the IO object readable?
@@ -32,7 +34,9 @@ module NIO
     alias_method :writeable?, :writable?
 
     # Is this monitor closed?
-    def closed?; @closed; end
+    def closed?
+      @closed
+    end
 
     # Deactivate this monitor
     def close(deregister = true)

data/lib/nio/selector.rb

@@ -1,4 +1,4 @@
-require 'set'
+require "set"
 
 module NIO
   # Selectors monitor IO objects for events of interest
@@ -20,13 +20,10 @@ module NIO
     # * :rw - is the IO either readable or writeable?
     def register(io, interest)
       @lock.synchronize do
-        if closed?
-          raise IOError, "selector is closed"
-        end
+        fail IOError, "selector is closed" if closed?
 
-        if monitor = @selectables[io]
-          raise ArgumentError, "this IO is already registered with the selector as #{monitor.interests.inspect}"
-        end
+        monitor = @selectables[io]
+        fail ArgumentError, "already registered as #{monitor.interests.inspect}" if monitor
 
         monitor = Monitor.new(io, interest, self)
         @selectables[monitor.io] = monitor
@@ -39,20 +36,21 @@ module NIO
     def deregister(io)
       @lock.synchronize do
         monitor = @selectables.delete io
-        monitor.close(false) if monitor and not monitor.closed?
+        monitor.close(false) if monitor && !monitor.closed?
         monitor
       end
     end
 
     # Is the given IO object registered with the selector?
     def registered?(io)
-      @lock.synchronize { @selectables.has_key? io }
+      @lock.synchronize { @selectables.key? io }
     end
 
     # Select which monitors are ready
     def select(timeout = nil)
       @lock.synchronize do
-        readers, writers = [@wakeup], []
+        readers = [@wakeup]
+        writers = []
 
         @selectables.each do |io, monitor|
           readers << io if monitor.interests == :r || monitor.interests == :rw
@@ -124,7 +122,9 @@ module NIO
     end
 
     # Is this selector closed?
-    def closed?; @closed end
+    def closed?
+      @closed
+    end
 
     def empty?
       @selectables.empty?

data/lib/nio/version.rb

@@ -1,3 +1,3 @@
 module NIO
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/nio4r.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/nio/version', __FILE__)
+require File.expand_path("../lib/nio/version", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Tony Arcieri"]
@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/celluloid/nio4r"
   gem.license       = "MIT"
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "nio4r"
@@ -25,5 +25,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rake-compiler"
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec", "~> 3.0.0"
+  gem.add_development_dependency "rspec", "~> 3.0"
+  gem.add_development_dependency "rubocop"
 end

data/spec/nio/acceptables_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require "spec_helper"
 
-describe "NIO acceptables" do
+RSpec.describe "NIO acceptables" do
   shared_context "an NIO acceptable" do
     let(:selector) { NIO::Selector.new }
 
@@ -15,7 +15,7 @@ describe "NIO acceptables" do
   end
 
   describe TCPServer do
-    let(:tcp_port) { 23456 }
+    let(:tcp_port) { 23_456 }
 
     let :acceptable_subject do
       server = TCPServer.new("localhost", tcp_port)

data/spec/nio/monitor_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require "spec_helper"
 
-describe NIO::Monitor do
+RSpec.describe NIO::Monitor do
   let(:pipes) { IO.pipe }
   let(:reader) { pipes.first }
   let(:writer) { pipes.last }
@@ -30,7 +30,8 @@ describe NIO::Monitor do
 
   it "knows what operations IO objects are ready for" do
     # For whatever odd reason this breaks unless we eagerly evaluate subject
-    reader_monitor, writer_monitor = subject, peer
+    reader_monitor = subject
+    writer_monitor = peer
 
     selected = selector.select(0)
     expect(selected).not_to include(reader_monitor)

data/spec/nio/selectables/pipe_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require "spec_helper"
 
-describe "IO.pipe" do
+RSpec.describe "IO.pipe" do
   let(:pair) { IO.pipe }
 
   let :unreadable_subject do
@@ -18,17 +18,17 @@ describe "IO.pipe" do
   let :unwritable_subject do
     reader, pipe = IO.pipe
 
-    #HACK: On OS X 10.8, this str must be larger than PIPE_BUF. Otherwise,
+    # HACK: On OS X 10.8, this str must be larger than PIPE_BUF. Otherwise,
     #      the write is atomic and select() will return writable but write()
     #      will throw EAGAIN if there is too little space to write the string
     # TODO: Use FFI to lookup the platform-specific size of PIPE_BUF
-    str = "JUNK IN THE TUBES" * 10000
+    str = "JUNK IN THE TUBES" * 10_000
     begin
       pipe.write_nonblock str
       _, writers = select [], [pipe], [], 0
     rescue Errno::EPIPE
       break
-    end while writers and writers.include? pipe
+    end while writers && writers.include?(pipe)
 
     pipe
   end

data/spec/nio/selectables/ssl_socket_spec.rb

@@ -1,20 +1,20 @@
-require 'spec_helper'
-require 'openssl'
+require "spec_helper"
+require "openssl"
 
-describe OpenSSL::SSL::SSLSocket, :if => RUBY_VERSION >= "1.9.0" do
-  let(:tcp_port) { 34567 }
+RSpec.describe OpenSSL::SSL::SSLSocket, if: RUBY_VERSION >= "1.9.0" do
+  let(:tcp_port) { 34_567 }
 
   let(:ssl_key) { OpenSSL::PKey::RSA.new(1024) }
 
   let(:ssl_cert) do
-    name = OpenSSL::X509::Name.new([%w[CN localhost]])
+    name = OpenSSL::X509::Name.new([%w(CN localhost)])
     OpenSSL::X509::Certificate.new.tap do |cert|
       cert.version = 2
       cert.serial = 1
       cert.issuer = name
       cert.subject = name
       cert.not_before = Time.now
-      cert.not_after = Time.now + (365 * 24 *60 *60)
+      cert.not_after = Time.now + (365 * 24 * 60 * 60)
       cert.public_key = ssl_key.public_key
 
       cert.sign(ssl_key, OpenSSL::Digest::SHA1.new)
@@ -114,8 +114,8 @@ describe OpenSSL::SSL::SSLSocket, :if => RUBY_VERSION >= "1.9.0" do
       expect(count).not_to eq(0)
     rescue IO::WaitReadable, IO::WaitWritable
       pending "SSL will report writable but not accept writes"
-      raise if(writers.include? ssl_client)
-    end while writers and writers.include? ssl_client
+      raise if writers.include? ssl_client
+    end while writers && writers.include?(ssl_client)
 
     # I think the kernel might manage to drain its buffer a bit even after
     # the socket first goes unwritable. Attempt to sleep past this and then
@@ -124,15 +124,15 @@ describe OpenSSL::SSL::SSLSocket, :if => RUBY_VERSION >= "1.9.0" do
 
     # Once more for good measure!
     begin
-#        ssl_client.write_nonblock "X" * 1024
+      #        ssl_client.write_nonblock "X" * 1024
       loop { ssl_client.write_nonblock "X" * 1024 }
     rescue OpenSSL::SSL::SSLError
     end
 
     # Sanity check to make sure we actually produced an unwritable socket
-#      if select([], [ssl_client], [], 0)
-#        pending "Failed to produce an unwritable socket"
-#      end
+    #      if select([], [ssl_client], [], 0)
+    #        pending "Failed to produce an unwritable socket"
+    #      end
 
     ssl_client
   end