nio4r 2.3.1-java → 2.5.3-java

data/ext/libev/ev_poll.c

@@ -1,7 +1,7 @@
 /*
  * libev poll fd activity backend
  *
- * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libev@schmorp.de>
+ * Copyright (c) 2007,2008,2009,2010,2011,2016,2019 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modifica-
@@ -41,10 +41,12 @@
 
 inline_size
 void
-pollidx_init (int *base, int count)
+array_needsize_pollidx (int *base, int offset, int count)
 {
-  /* consider using memset (.., -1, ...), which is practically guaranteed
-   * to work on all systems implementing poll */
+  /* using memset (.., -1, ...) is tempting, we we try
+   * to be ultraportable
+   */
+  base += offset;
   while (count--)
     *base++ = -1;
 }
@@ -57,14 +59,14 @@ poll_modify (EV_P_ int fd, int oev, int nev)
   if (oev == nev)
     return;
 
-  array_needsize (int, pollidxs, pollidxmax, fd + 1, pollidx_init);
+  array_needsize (int, pollidxs, pollidxmax, fd + 1, array_needsize_pollidx);
 
   idx = pollidxs [fd];
 
   if (idx < 0) /* need to allocate a new pollfd */
     {
       pollidxs [fd] = idx = pollcnt++;
-      array_needsize (struct pollfd, polls, pollmax, pollcnt, EMPTY2);
+      array_needsize (struct pollfd, polls, pollmax, pollcnt, array_needsize_noinit);
       polls [idx].fd = fd;
     }
 
@@ -108,14 +110,17 @@ poll_poll (EV_P_ ev_tstamp timeout)
   else
     for (p = polls; res; ++p)
       {
-        assert (("libev: poll() returned illegal result, broken BSD kernel?", p < polls + pollcnt));
+        assert (("libev: poll returned illegal result, broken BSD kernel?", p < polls + pollcnt));
 
         if (expect_false (p->revents)) /* this expect is debatable */
           {
             --res;
 
             if (expect_false (p->revents & POLLNVAL))
-              fd_kill (EV_A_ p->fd);
+              {
+                assert (("libev: poll found invalid fd in poll set", 0));
+                fd_kill (EV_A_ p->fd);
+              }
             else
               fd_event (
                 EV_A_

data/ext/libev/ev_port.c

@@ -1,7 +1,7 @@
 /*
  * libev solaris event port backend
  *
- * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libev@schmorp.de>
+ * Copyright (c) 2007,2008,2009,2010,2011,2019 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modifica-
@@ -69,7 +69,10 @@ port_associate_and_check (EV_P_ int fd, int ev)
   )
     {
       if (errno == EBADFD)
-        fd_kill (EV_A_ fd);
+        {
+          assert (("libev: port_associate found invalid fd", errno != EBADFD));
+          fd_kill (EV_A_ fd);
+        }
       else
         ev_syserr ("(libev) port_associate");
     }

data/ext/libev/ev_vars.h

@@ -1,7 +1,7 @@
 /*
  * loop member variable declarations
  *
- * Copyright (c) 2007,2008,2009,2010,2011,2012,2013 Marc Alexander Lehmann <libev@schmorp.de>
+ * Copyright (c) 2007,2008,2009,2010,2011,2012,2013,2019 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modifica-
@@ -107,6 +107,17 @@ VARx(int, epoll_epermcnt)
 VARx(int, epoll_epermmax)
 #endif
 
+#if EV_USE_LINUXAIO || EV_GENWRAP
+VARx(aio_context_t, linuxaio_ctx)
+VARx(int, linuxaio_iteration)
+VARx(struct aniocb **, linuxaio_iocbps)
+VARx(int, linuxaio_iocbpmax)
+VARx(struct iocb **, linuxaio_submits)
+VARx(int, linuxaio_submitcnt)
+VARx(int, linuxaio_submitmax)
+VARx(ev_io, linuxaio_epoll_w)
+#endif
+
 #if EV_USE_KQUEUE || EV_GENWRAP
 VARx(pid_t, kqueue_fd_pid)
 VARx(struct kevent *, kqueue_changes)
@@ -195,8 +206,8 @@ VARx(unsigned int, loop_depth) /* #ev_run enters - #ev_run leaves */
 
 VARx(void *, userdata)
 /* C++ doesn't support the ev_loop_callback typedef here. stinks. */
-VAR (release_cb, void (*release_cb)(EV_P) EV_THROW)
-VAR (acquire_cb, void (*acquire_cb)(EV_P) EV_THROW)
+VAR (release_cb, void (*release_cb)(EV_P) EV_NOEXCEPT)
+VAR (acquire_cb, void (*acquire_cb)(EV_P) EV_NOEXCEPT)
 VAR (invoke_cb , ev_loop_callback invoke_cb)
 #endif
 

data/ext/libev/ev_wrap.h

@@ -50,6 +50,14 @@
 #define kqueue_eventmax ((loop)->kqueue_eventmax)
 #define kqueue_events ((loop)->kqueue_events)
 #define kqueue_fd_pid ((loop)->kqueue_fd_pid)
+#define linuxaio_ctx ((loop)->linuxaio_ctx)
+#define linuxaio_epoll_w ((loop)->linuxaio_epoll_w)
+#define linuxaio_iocbpmax ((loop)->linuxaio_iocbpmax)
+#define linuxaio_iocbps ((loop)->linuxaio_iocbps)
+#define linuxaio_iteration ((loop)->linuxaio_iteration)
+#define linuxaio_submitcnt ((loop)->linuxaio_submitcnt)
+#define linuxaio_submitmax ((loop)->linuxaio_submitmax)
+#define linuxaio_submits ((loop)->linuxaio_submits)
 #define loop_count ((loop)->loop_count)
 #define loop_depth ((loop)->loop_depth)
 #define loop_done ((loop)->loop_done)
@@ -149,6 +157,14 @@
 #undef kqueue_eventmax
 #undef kqueue_events
 #undef kqueue_fd_pid
+#undef linuxaio_ctx
+#undef linuxaio_epoll_w
+#undef linuxaio_iocbpmax
+#undef linuxaio_iocbps
+#undef linuxaio_iteration
+#undef linuxaio_submitcnt
+#undef linuxaio_submitmax
+#undef linuxaio_submits
 #undef loop_count
 #undef loop_depth
 #undef loop_done

data/ext/nio4r/extconf.rb

@@ -4,6 +4,7 @@ require "rubygems"
 
 # Write a dummy Makefile on Windows because we use the pure Ruby implementation there
 if Gem.win_platform?
+  require "devkit" if RUBY_PLATFORM.include?("mingw")
   File.write("Makefile", "all install::\n")
   File.write("nio4r_ext.so", "")
   exit
@@ -13,6 +14,7 @@ require "mkmf"
 
 have_header("unistd.h")
 
+$defs << "-DEV_USE_LINUXAIO"     if have_header("linux/aio_abi.h")
 $defs << "-DEV_USE_SELECT"       if have_header("sys/select.h")
 $defs << "-DEV_USE_POLL"         if have_type("port_event_t", "poll.h")
 $defs << "-DEV_USE_EPOLL"        if have_header("sys/epoll.h")

data/ext/nio4r/monitor.c

@@ -66,6 +66,7 @@ static VALUE NIO_Monitor_allocate(VALUE klass)
 
 static void NIO_Monitor_mark(struct NIO_Monitor *monitor)
 {
+    return rb_gc_mark(monitor->self);
 }
 
 static void NIO_Monitor_free(struct NIO_Monitor *monitor)

data/ext/nio4r/nio4r.h

@@ -12,7 +12,7 @@
 
 struct NIO_Selector
 {
-    ev_loop *ev_loop;
+    struct ev_loop *ev_loop;
     struct ev_timer timer; /* for timeouts */
     struct ev_io wakeup;
 

data/ext/nio4r/org/nio4r/Selector.java

@@ -19,6 +19,7 @@ import org.jruby.anno.JRubyMethod;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.io.OpenFile;
 
 import org.nio4r.Monitor;
 
@@ -136,7 +137,10 @@ public class Selector extends RubyObject {
     @JRubyMethod
     public IRubyObject deregister(ThreadContext context, IRubyObject io) {
         Ruby runtime = context.getRuntime();
-        Channel rawChannel = RubyIO.convertToIO(context, io).getChannel();
+        OpenFile file = RubyIO.convertToIO(context, io).getOpenFileInitialized();
+        if (file.fd() == null)
+            return context.nil;
+        Channel rawChannel = file.channel();
 
         if(!(rawChannel instanceof SelectableChannel)) {
             throw runtime.newArgumentError("not a selectable IO object");

data/ext/nio4r/selector.c

@@ -52,8 +52,8 @@ static VALUE NIO_Selector_close_synchronized(VALUE *args);
 static VALUE NIO_Selector_closed_synchronized(VALUE *args);
 
 static int NIO_Selector_run(struct NIO_Selector *selector, VALUE timeout);
-static void NIO_Selector_timeout_callback(ev_loop *ev_loop, struct ev_timer *timer, int revents);
-static void NIO_Selector_wakeup_callback(ev_loop *ev_loop, struct ev_io *io, int revents);
+static void NIO_Selector_timeout_callback(struct ev_loop *ev_loop, struct ev_timer *timer, int revents);
+static void NIO_Selector_wakeup_callback(struct ev_loop *ev_loop, struct ev_io *io, int revents);
 
 /* Default number of slots in the buffer for selected monitors */
 #define INITIAL_READY_BUFFER 32
@@ -530,12 +530,12 @@ static VALUE NIO_Selector_is_empty(VALUE self)
 
 
 /* Called whenever a timeout fires on the event loop */
-static void NIO_Selector_timeout_callback(ev_loop *ev_loop, struct ev_timer *timer, int revents)
+static void NIO_Selector_timeout_callback(struct ev_loop *ev_loop, struct ev_timer *timer, int revents)
 {
 }
 
 /* Called whenever a wakeup request is sent to a selector */
-static void NIO_Selector_wakeup_callback(ev_loop *ev_loop, struct ev_io *io, int revents)
+static void NIO_Selector_wakeup_callback(struct ev_loop *ev_loop, struct ev_io *io, int revents)
 {
     char buffer[128];
     struct NIO_Selector *selector = (struct NIO_Selector *)io->data;
@@ -546,7 +546,7 @@ static void NIO_Selector_wakeup_callback(ev_loop *ev_loop, struct ev_io *io, int
 }
 
 /* libev callback fired whenever a monitor gets an event */
-void NIO_Selector_monitor_callback(ev_loop *ev_loop, struct ev_io *io, int revents)
+void NIO_Selector_monitor_callback(struct ev_loop *ev_loop, struct ev_io *io, int revents)
 {
     struct NIO_Monitor *monitor_data = (struct NIO_Monitor *)io->data;
     struct NIO_Selector *selector = monitor_data->selector;

data/lib/nio.rb

@@ -18,7 +18,7 @@ if ENV["NIO4R_PURE"] == "true" || (Gem.win_platform? && !defined?(JRUBY_VERSION)
   require "nio/monitor"
   require "nio/selector"
   require "nio/bytebuffer"
-  NIO::ENGINE = "ruby".freeze
+  NIO::ENGINE = "ruby"
 else
   require "nio4r_ext"
 
@@ -26,8 +26,8 @@ else
     require "java"
     require "jruby"
     org.nio4r.Nio4r.new.load(JRuby.runtime, false)
-    NIO::ENGINE = "java".freeze
+    NIO::ENGINE = "java"
   else
-    NIO::ENGINE = "libev".freeze
+    NIO::ENGINE = "libev"
   end
 end

data/lib/nio/bytebuffer.rb

@@ -24,6 +24,7 @@ module NIO
     # @return [NIO::ByteBuffer]
     def initialize(capacity)
       raise TypeError, "no implicit conversion of #{capacity.class} to Integer" unless capacity.is_a?(Integer)
+
       @capacity = capacity
       clear
     end
@@ -119,9 +120,11 @@ module NIO
     # @return [self]
     def put(str)
       raise TypeError, "expected String, got #{str.class}" unless str.respond_to?(:to_str)
+
       str = str.to_str
 
       raise OverflowError, "buffer is full" if str.length > @limit - @position
+
       @buffer[@position...str.length] = str
       @position += str.length
       self
@@ -188,6 +191,7 @@ module NIO
     # @raise [NIO::ByteBuffer::MarkUnsetError] mark has not been set (call `#mark` first)
     def reset
       raise MarkUnsetError, "mark has not been set" unless @mark
+
       @position = @mark
       self
     end

data/lib/nio/monitor.rb

@@ -6,16 +6,18 @@ module NIO
     attr_reader :io, :interests, :selector
     attr_accessor :value, :readiness
 
-    # :nodoc
+    # :nodoc:
     def initialize(io, interests, selector)
-      unless io.is_a?(IO)
-        if IO.respond_to? :try_convert
-          io = IO.try_convert(io)
-        elsif io.respond_to? :to_io
-          io = io.to_io
-        end
+      unless defined?(::OpenSSL) && io.is_a?(::OpenSSL::SSL::SSLSocket)
+        unless io.is_a?(IO)
+          if IO.respond_to? :try_convert
+            io = IO.try_convert(io)
+          elsif io.respond_to? :to_io
+            io = io.to_io
+          end
 
-        raise TypeError, "can't convert #{io.class} into IO" unless io.is_a? IO
+          raise TypeError, "can't convert #{io.class} into IO" unless io.is_a? IO
+        end
       end
 
       @io        = io

data/lib/nio/selector.rb

@@ -44,7 +44,9 @@ module NIO
     # * :w - is the IO writeable?
     # * :rw - is the IO either readable or writeable?
     def register(io, interest)
-      io = IO.try_convert(io)
+      unless defined?(::OpenSSL) && io.is_a?(::OpenSSL::SSL::SSLSocket)
+        io = IO.try_convert(io)
+      end
 
       @lock.synchronize do
         raise IOError, "selector is closed" if closed?

data/lib/nio/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NIO
-  VERSION = "2.3.1".freeze
+  VERSION = "2.5.3"
 end

data/nio4r.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.expand_path("../lib/nio/version", __FILE__)
+require File.expand_path("lib/nio/version", __dir__)
 
 Gem::Specification.new do |spec|
   spec.authors       = ["Tony Arcieri"]
@@ -20,7 +20,15 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.version       = NIO::VERSION
 
-  spec.required_ruby_version = ">= 2.2.2"
+  spec.metadata = {
+    "bug_tracker_uri"   => "https://github.com/socketry/nio4r/issues",
+    "changelog_uri"     => "https://github.com/socketry/nio4r/blob/master/CHANGES.md",
+    "documentation_uri" => "https://www.rubydoc.info/gems/nio4r/#{spec.version}",
+    "source_code_uri"   => "https://github.com/socketry/nio4r/tree/v#{spec.version}",
+    "wiki_uri"          => "https://github.com/socketry/nio4r/wiki"
+  }
+
+  spec.required_ruby_version = ">= 2.4"
 
   if defined? JRUBY_VERSION
     spec.files << "lib/nio4r_ext.jar"

data/{tasks → rakelib}/extension.rake

@@ -4,6 +4,8 @@ if defined? JRUBY_VERSION
   require "rake/javaextensiontask"
   Rake::JavaExtensionTask.new("nio4r_ext") do |ext|
     ext.ext_dir = "ext/nio4r"
+    ext.source_version = "1.8"
+    ext.target_version = "1.8"
   end
 else
   require "rake/extensiontask"

data/spec/nio/acceptables_spec.rb

@@ -17,16 +17,14 @@ RSpec.describe "NIO acceptables" do
   end
 
   describe TCPServer do
-    let(:port) { next_available_tcp_port }
-
     let :acceptable_subject do
-      server = TCPServer.new("127.0.0.1", port)
-      TCPSocket.open("127.0.0.1", port)
+      server = TCPServer.new("127.0.0.1", 0)
+      TCPSocket.open("127.0.0.1", server.local_address.ip_port)
       server
     end
 
     let :unacceptable_subject do
-      TCPServer.new("127.0.0.1", port + 1)
+      TCPServer.new("127.0.0.1", 0)
     end
 
     it_behaves_like "an NIO acceptable"

data/spec/nio/bytebuffer_spec.rb

@@ -2,7 +2,6 @@
 
 require "spec_helper"
 
-# rubocop:disable Metrics/BlockLength
 RSpec.describe NIO::ByteBuffer do
   let(:capacity)       { 256 }
   let(:example_string) { "Testing 1 2 3..." }
@@ -288,8 +287,8 @@ RSpec.describe NIO::ByteBuffer do
 
   context "I/O" do
     let(:addr)   { "127.0.0.1" }
-    let(:port)   { next_available_tcp_port }
-    let(:server) { TCPServer.new(addr, port) }
+    let(:server) { TCPServer.new(addr, 0) }
+    let(:port)   { server.local_address.ip_port }
     let(:client) { TCPSocket.new(addr, port) }
     let(:peer)   { server_thread.value }
 
@@ -353,4 +352,3 @@ RSpec.describe NIO::ByteBuffer do
     end
   end
 end
-# rubocop:enable Metrics/BlockLength

data/spec/nio/monitor_spec.rb

@@ -5,9 +5,9 @@ require "socket"
 
 RSpec.describe NIO::Monitor do
   let(:addr) { "127.0.0.1" }
-  let(:port) { next_available_tcp_port }
 
-  let(:reader) { TCPServer.new(addr, port) }
+  let(:reader) { TCPServer.new(addr, 0) }
+  let(:port) { reader.local_address.ip_port }
   let(:writer) { TCPSocket.new(addr, port) }
 
   let(:selector) { NIO::Selector.new }

data/spec/nio/selectables/ssl_socket_spec.rb

@@ -1,13 +1,18 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require "openssl"
 
 RSpec.describe OpenSSL::SSL::SSLSocket do
+
+  require "openssl"
+
+  before(:all) do
+    @tls = []
+  end
+
   let(:addr) { "127.0.0.1" }
-  let(:port) { next_available_tcp_port }
 
-  let(:ssl_key) { OpenSSL::PKey::RSA.new(1024) }
+  let(:ssl_key) { OpenSSL::PKey::RSA.new(2048) }
 
   let(:ssl_cert) do
     name = OpenSSL::X509::Name.new([%w[CN 127.0.0.1]])
@@ -28,12 +33,19 @@ RSpec.describe OpenSSL::SSL::SSLSocket do
     OpenSSL::SSL::SSLContext.new.tap do |ctx|
       ctx.cert = ssl_cert
       ctx.key = ssl_key
+      unless @tls.empty?
+        if ctx.respond_to? :set_minmax_proto_version, true
+          ctx.max_version = @tls[0]
+        else
+          ctx.ssl_version = @tls[1]
+        end
+      end
     end
   end
 
   let :readable_subject do
-    server = TCPServer.new(addr, port)
-    client = TCPSocket.open(addr, port)
+    server = TCPServer.new(addr, 0)
+    client = TCPSocket.open(addr, server.local_address.ip_port)
     peer = server.accept
 
     ssl_peer = OpenSSL::SSL::SSLSocket.new(peer, ssl_server_context)
@@ -47,16 +59,17 @@ RSpec.describe OpenSSL::SSL::SSLSocket do
 
     ssl_peer.accept
     ssl_peer << "data"
+    ssl_peer.flush
 
     thread.join
-    pending "Failed to produce a readable SSL socket" unless select([ssl_client], [], [], 0)
 
+    pending "Failed to produce a readable socket" unless select([ssl_client], [], [], 10)
     ssl_client
   end
 
   let :unreadable_subject do
-    server = TCPServer.new(addr, port)
-    client = TCPSocket.new(addr, port)
+    server = TCPServer.new(addr, 0)
+    client = TCPSocket.new(addr, server.local_address.ip_port)
     peer = server.accept
 
     ssl_peer = OpenSSL::SSL::SSLSocket.new(peer, ssl_server_context)
@@ -70,13 +83,17 @@ RSpec.describe OpenSSL::SSL::SSLSocket do
     ssl_peer.accept
     thread.join
 
+    if ssl_client.ssl_version == "TLSv1.3"
+      expect(ssl_client.read_nonblock(1, exception: false)).to eq(:wait_readable)
+    end
+
     pending "Failed to produce an unreadable socket" if select([ssl_client], [], [], 0)
     ssl_client
   end
 
   let :writable_subject do
-    server = TCPServer.new(addr, port)
-    client = TCPSocket.new(addr, port)
+    server = TCPServer.new(addr, 0)
+    client = TCPSocket.new(addr, server.local_address.ip_port)
     peer = server.accept
 
     ssl_peer = OpenSSL::SSL::SSLSocket.new(peer, ssl_server_context)
@@ -95,8 +112,8 @@ RSpec.describe OpenSSL::SSL::SSLSocket do
   end
 
   let :unwritable_subject do
-    server = TCPServer.new(addr, port)
-    client = TCPSocket.new(addr, port)
+    server = TCPServer.new(addr, 0)
+    client = TCPSocket.new(addr, server.local_address.ip_port)
     peer = server.accept
 
     ssl_peer = OpenSSL::SSL::SSLSocket.new(peer, ssl_server_context)
@@ -128,22 +145,22 @@ RSpec.describe OpenSSL::SSL::SSLSocket 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
 
   let :pair do
-    server = TCPServer.new(addr, port)
-    client = TCPSocket.new(addr, port)
+    server = TCPServer.new(addr, 0)
+    client = TCPSocket.new(addr, server.local_address.ip_port)
     peer = server.accept
 
     ssl_peer = OpenSSL::SSL::SSLSocket.new(peer, ssl_server_context)
@@ -159,6 +176,19 @@ RSpec.describe OpenSSL::SSL::SSLSocket do
     [thread.value, ssl_peer]
   end
 
-  it_behaves_like "an NIO selectable"
-  it_behaves_like "an NIO selectable stream"
+  describe "using TLS 1.2" do
+    before(:all) do
+      @tls = %i[TLS1_2 TLSv1_2]
+    end
+    it_behaves_like "an NIO selectable"
+    it_behaves_like "an NIO selectable stream"
+  end
+
+  describe "using TLS 1.3", if: OpenSSL::SSL.const_defined?(:TLS1_3_VERSION) do
+    before(:all) do
+      @tls = %i[TLS1_3 TLSv1_3]
+    end
+    it_behaves_like "an NIO selectable"
+    it_behaves_like "an NIO selectable stream", true
+  end
 end