nio4r 2.5.2 → 2.5.9

data/ext/nio4r/bytebuffer.c

@@ -42,7 +42,7 @@ void Init_NIO_ByteBuffer()
     cNIO_ByteBuffer = rb_define_class_under(mNIO, "ByteBuffer", rb_cObject);
     rb_define_alloc_func(cNIO_ByteBuffer, NIO_ByteBuffer_allocate);
 
-    cNIO_ByteBuffer_OverflowError  = rb_define_class_under(cNIO_ByteBuffer, "OverflowError", rb_eIOError);
+    cNIO_ByteBuffer_OverflowError = rb_define_class_under(cNIO_ByteBuffer, "OverflowError", rb_eIOError);
     cNIO_ByteBuffer_UnderflowError = rb_define_class_under(cNIO_ByteBuffer, "UnderflowError", rb_eIOError);
     cNIO_ByteBuffer_MarkUnsetError = rb_define_class_under(cNIO_ByteBuffer, "MarkUnsetError", rb_eIOError);
 
@@ -85,8 +85,8 @@ static void NIO_ByteBuffer_gc_mark(struct NIO_ByteBuffer *buffer)
 
 static void NIO_ByteBuffer_free(struct NIO_ByteBuffer *buffer)
 {
-    if(buffer->buffer)
-      xfree(buffer->buffer);
+    if (buffer->buffer)
+        xfree(buffer->buffer);
     xfree(buffer);
 }
 
@@ -133,17 +133,17 @@ static VALUE NIO_ByteBuffer_set_position(VALUE self, VALUE new_position)
 
     pos = NUM2INT(new_position);
 
-    if(pos < 0) {
+    if (pos < 0) {
         rb_raise(rb_eArgError, "negative position given");
     }
 
-    if(pos > buffer->limit) {
+    if (pos > buffer->limit) {
         rb_raise(rb_eArgError, "specified position exceeds limit");
     }
 
     buffer->position = pos;
 
-    if(buffer->mark > buffer->position) {
+    if (buffer->mark > buffer->position) {
         buffer->mark = MARK_UNSET;
     }
 
@@ -166,21 +166,21 @@ static VALUE NIO_ByteBuffer_set_limit(VALUE self, VALUE new_limit)
 
     lim = NUM2INT(new_limit);
 
-    if(lim < 0) {
+    if (lim < 0) {
         rb_raise(rb_eArgError, "negative limit given");
     }
 
-    if(lim > buffer->capacity) {
+    if (lim > buffer->capacity) {
         rb_raise(rb_eArgError, "specified limit exceeds capacity");
     }
 
     buffer->limit = lim;
 
-    if(buffer->position > lim) {
+    if (buffer->position > lim) {
         buffer->position = lim;
     }
 
-    if(buffer->mark > lim) {
+    if (buffer->mark > lim) {
         buffer->mark = MARK_UNSET;
     }
 
@@ -220,17 +220,17 @@ static VALUE NIO_ByteBuffer_get(int argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "01", &length);
 
-    if(length == Qnil) {
+    if (length == Qnil) {
         len = buffer->limit - buffer->position;
     } else {
         len = NUM2INT(length);
     }
 
-    if(len < 0) {
+    if (len < 0) {
         rb_raise(rb_eArgError, "negative length given");
     }
 
-    if(len > buffer->limit - buffer->position) {
+    if (len > buffer->limit - buffer->position) {
         rb_raise(cNIO_ByteBuffer_UnderflowError, "not enough data in buffer");
     }
 
@@ -248,11 +248,11 @@ static VALUE NIO_ByteBuffer_fetch(VALUE self, VALUE index)
 
     i = NUM2INT(index);
 
-    if(i < 0) {
+    if (i < 0) {
         rb_raise(rb_eArgError, "negative index given");
     }
 
-    if(i >= buffer->limit) {
+    if (i >= buffer->limit) {
         rb_raise(rb_eArgError, "specified index exceeds limit");
     }
 
@@ -268,7 +268,7 @@ static VALUE NIO_ByteBuffer_put(VALUE self, VALUE string)
     StringValue(string);
     length = RSTRING_LEN(string);
 
-    if(length > buffer->limit - buffer->position) {
+    if (length > buffer->limit - buffer->position) {
         rb_raise(cNIO_ByteBuffer_OverflowError, "buffer is full");
     }
 
@@ -289,14 +289,14 @@ static VALUE NIO_ByteBuffer_read_from(VALUE self, VALUE io)
     rb_io_set_nonblock(fptr);
 
     nbytes = buffer->limit - buffer->position;
-    if(nbytes == 0) {
+    if (nbytes == 0) {
         rb_raise(cNIO_ByteBuffer_OverflowError, "buffer is full");
     }
 
     bytes_read = read(FPTR_TO_FD(fptr), buffer->buffer + buffer->position, nbytes);
 
-    if(bytes_read < 0) {
-        if(errno == EAGAIN) {
+    if (bytes_read < 0) {
+        if (errno == EAGAIN) {
             return INT2NUM(0);
         } else {
             rb_sys_fail("write");
@@ -319,14 +319,14 @@ static VALUE NIO_ByteBuffer_write_to(VALUE self, VALUE io)
     rb_io_set_nonblock(fptr);
 
     nbytes = buffer->limit - buffer->position;
-    if(nbytes == 0) {
+    if (nbytes == 0) {
         rb_raise(cNIO_ByteBuffer_UnderflowError, "no data remaining in buffer");
     }
 
     bytes_written = write(FPTR_TO_FD(fptr), buffer->buffer + buffer->position, nbytes);
 
-    if(bytes_written < 0) {
-        if(errno == EAGAIN) {
+    if (bytes_written < 0) {
+        if (errno == EAGAIN) {
             return INT2NUM(0);
         } else {
             rb_sys_fail("write");
@@ -375,7 +375,7 @@ static VALUE NIO_ByteBuffer_reset(VALUE self)
     struct NIO_ByteBuffer *buffer;
     Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
 
-    if(buffer->mark < 0) {
+    if (buffer->mark < 0) {
         rb_raise(cNIO_ByteBuffer_MarkUnsetError, "mark has not been set");
     } else {
         buffer->position = buffer->mark;
@@ -402,8 +402,8 @@ static VALUE NIO_ByteBuffer_each(VALUE self)
     struct NIO_ByteBuffer *buffer;
     Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
 
-    if(rb_block_given_p()) {
-        for(i = 0; i < buffer->limit; i++) {
+    if (rb_block_given_p()) {
+        for (i = 0; i < buffer->limit; i++) {
             rb_yield(INT2NUM(buffer->buffer[i]));
         }
     } else {
@@ -421,9 +421,8 @@ static VALUE NIO_ByteBuffer_inspect(VALUE self)
     return rb_sprintf(
         "#<%s:%p @position=%d @limit=%d @capacity=%d>",
         rb_class2name(CLASS_OF(self)),
-        (void*)self,
+        (void *)self,
         buffer->position,
         buffer->limit,
-        buffer->capacity
-    );
+        buffer->capacity);
 }

data/ext/nio4r/extconf.rb

@@ -4,6 +4,10 @@ require "rubygems"
 
 # Write a dummy Makefile on Windows because we use the pure Ruby implementation there
 if Gem.win_platform?
+  begin
+    require "devkit" if RUBY_PLATFORM.include?("mingw")
+  rescue LoadError => e
+  end
   File.write("Makefile", "all install::\n")
   File.write("nio4r_ext.so", "")
   exit
@@ -14,6 +18,7 @@ require "mkmf"
 have_header("unistd.h")
 
 $defs << "-DEV_USE_LINUXAIO"     if have_header("linux/aio_abi.h")
+$defs << "-DEV_USE_IOURING"      if have_header("linux/io_uring.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")
@@ -21,7 +26,13 @@ $defs << "-DEV_USE_KQUEUE"       if have_header("sys/event.h") && have_header("s
 $defs << "-DEV_USE_PORT"         if have_type("port_event_t", "port.h")
 $defs << "-DHAVE_SYS_RESOURCE_H" if have_header("sys/resource.h")
 
+$defs << "-DEV_STANDALONE" # prevent libev from assuming "config.h" exists
+
 CONFIG["optflags"] << " -fno-strict-aliasing" unless RUBY_PLATFORM =~ /mswin/
 
+if RUBY_PLATFORM =~ /darwin/
+  $DLDFLAGS.gsub!(/\-arch\s+[^\s]+/, "")
+end
+
 dir_config "nio4r_ext"
 create_makefile "nio4r_ext"

data/ext/nio4r/libev.h

@@ -1,9 +1,7 @@
-#define EV_STANDALONE /* keeps ev from requiring config.h */
-
 #ifdef _WIN32
 #define EV_SELECT_IS_WINSOCKET 1
 #define EV_USE_MONOTONIC 0
 #define EV_USE_REALTIME 0
 #endif
 
-#include "../libev/ev.h"
+#include "../libev/ev.h"

data/ext/nio4r/monitor.c

@@ -4,6 +4,7 @@
  */
 
 #include "nio4r.h"
+#include <assert.h>
 
 static VALUE mNIO = Qnil;
 static VALUE cNIO_Monitor = Qnil;
@@ -60,12 +61,14 @@ void Init_NIO_Monitor()
 static VALUE NIO_Monitor_allocate(VALUE klass)
 {
     struct NIO_Monitor *monitor = (struct NIO_Monitor *)xmalloc(sizeof(struct NIO_Monitor));
-
+    assert(monitor);
+    *monitor = (struct NIO_Monitor){.self = Qnil};
     return Data_Wrap_Struct(klass, NIO_Monitor_mark, NIO_Monitor_free, monitor);
 }
 
 static void NIO_Monitor_mark(struct NIO_Monitor *monitor)
 {
+    rb_gc_mark(monitor->self);
 }
 
 static void NIO_Monitor_free(struct NIO_Monitor *monitor)
@@ -84,15 +87,14 @@ static VALUE NIO_Monitor_initialize(VALUE self, VALUE io, VALUE interests, VALUE
 
     Data_Get_Struct(self, struct NIO_Monitor, monitor);
 
-    if(interests_id == rb_intern("r")) {
+    if (interests_id == rb_intern("r")) {
         monitor->interests = EV_READ;
-    } else if(interests_id == rb_intern("w")) {
+    } else if (interests_id == rb_intern("w")) {
         monitor->interests = EV_WRITE;
-    } else if(interests_id == rb_intern("rw")) {
+    } else if (interests_id == rb_intern("rw")) {
         monitor->interests = EV_READ | EV_WRITE;
     } else {
-        rb_raise(rb_eArgError, "invalid event type %s (must be :r, :w, or :rw)",
-            RSTRING_PTR(rb_funcall(interests, rb_intern("inspect"), 0)));
+        rb_raise(rb_eArgError, "invalid event type %s (must be :r, :w, or :rw)", RSTRING_PTR(rb_funcall(interests, rb_intern("inspect"), 0)));
     }
 
     GetOpenFile(rb_convert_type(io, T_FILE, "IO", "to_io"), fptr);
@@ -112,7 +114,7 @@ static VALUE NIO_Monitor_initialize(VALUE self, VALUE io, VALUE interests, VALUE
     monitor->selector = selector;
 
     if (monitor->interests) {
-      ev_io_start(selector->ev_loop, &monitor->ev_io);
+        ev_io_start(selector->ev_loop, &monitor->ev_io);
     }
 
     return Qnil;
@@ -127,17 +129,17 @@ static VALUE NIO_Monitor_close(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "01", &deregister);
     selector = rb_ivar_get(self, rb_intern("selector"));
 
-    if(selector != Qnil) {
+    if (selector != Qnil) {
         /* if ev_loop is 0, it means that the loop has been stopped already (see NIO_Selector_shutdown) */
-        if(monitor->interests && monitor->selector->ev_loop) {
-          ev_io_stop(monitor->selector->ev_loop, &monitor->ev_io);
+        if (monitor->interests && monitor->selector->ev_loop) {
+            ev_io_stop(monitor->selector->ev_loop, &monitor->ev_io);
         }
 
         monitor->selector = 0;
         rb_ivar_set(self, rb_intern("selector"), Qnil);
-    
+
         /* Default value is true */
-        if(deregister == Qtrue || deregister == Qnil) {
+        if (deregister == Qtrue || deregister == Qnil) {
             rb_funcall(selector, rb_intern("deregister"), 1, rb_ivar_get(self, rb_intern("io")));
         }
     }
@@ -165,7 +167,7 @@ static VALUE NIO_Monitor_interests(VALUE self)
 
 static VALUE NIO_Monitor_set_interests(VALUE self, VALUE interests)
 {
-    if(NIL_P(interests)) {
+    if (NIL_P(interests)) {
         NIO_Monitor_update_interests(self, 0);
     } else {
         NIO_Monitor_update_interests(self, NIO_Monitor_symbol2interest(interests));
@@ -174,7 +176,8 @@ static VALUE NIO_Monitor_set_interests(VALUE self, VALUE interests)
     return rb_ivar_get(self, rb_intern("interests"));
 }
 
-static VALUE NIO_Monitor_add_interest(VALUE self, VALUE interest) {
+static VALUE NIO_Monitor_add_interest(VALUE self, VALUE interest)
+{
     struct NIO_Monitor *monitor;
     Data_Get_Struct(self, struct NIO_Monitor, monitor);
 
@@ -184,7 +187,8 @@ static VALUE NIO_Monitor_add_interest(VALUE self, VALUE interest) {
     return rb_ivar_get(self, rb_intern("interests"));
 }
 
-static VALUE NIO_Monitor_remove_interest(VALUE self, VALUE interest) {
+static VALUE NIO_Monitor_remove_interest(VALUE self, VALUE interest)
+{
     struct NIO_Monitor *monitor;
     Data_Get_Struct(self, struct NIO_Monitor, monitor);
 
@@ -214,11 +218,11 @@ static VALUE NIO_Monitor_readiness(VALUE self)
     struct NIO_Monitor *monitor;
     Data_Get_Struct(self, struct NIO_Monitor, monitor);
 
-    if((monitor->revents & (EV_READ | EV_WRITE)) == (EV_READ | EV_WRITE)) {
+    if ((monitor->revents & (EV_READ | EV_WRITE)) == (EV_READ | EV_WRITE)) {
         return ID2SYM(rb_intern("rw"));
-    } else if(monitor->revents & EV_READ) {
+    } else if (monitor->revents & EV_READ) {
         return ID2SYM(rb_intern("r"));
-    } else if(monitor->revents & EV_WRITE) {
+    } else if (monitor->revents & EV_WRITE) {
         return ID2SYM(rb_intern("w"));
     } else {
         return Qnil;
@@ -230,7 +234,7 @@ static VALUE NIO_Monitor_is_readable(VALUE self)
     struct NIO_Monitor *monitor;
     Data_Get_Struct(self, struct NIO_Monitor, monitor);
 
-    if(monitor->revents & EV_READ) {
+    if (monitor->revents & EV_READ) {
         return Qtrue;
     } else {
         return Qfalse;
@@ -242,7 +246,7 @@ static VALUE NIO_Monitor_is_writable(VALUE self)
     struct NIO_Monitor *monitor;
     Data_Get_Struct(self, struct NIO_Monitor, monitor);
 
-    if(monitor->revents & EV_WRITE) {
+    if (monitor->revents & EV_WRITE) {
         return Qtrue;
     } else {
         return Qfalse;
@@ -256,15 +260,14 @@ static int NIO_Monitor_symbol2interest(VALUE interests)
     ID interests_id;
     interests_id = SYM2ID(interests);
 
-    if(interests_id == rb_intern("r")) {
+    if (interests_id == rb_intern("r")) {
         return EV_READ;
-    } else if(interests_id == rb_intern("w")) {
+    } else if (interests_id == rb_intern("w")) {
         return EV_WRITE;
-    } else if(interests_id == rb_intern("rw")) {
+    } else if (interests_id == rb_intern("rw")) {
         return EV_READ | EV_WRITE;
     } else {
-        rb_raise(rb_eArgError, "invalid interest type %s (must be :r, :w, or :rw)",
-            RSTRING_PTR(rb_funcall(interests, rb_intern("inspect"), 0)));
+        rb_raise(rb_eArgError, "invalid interest type %s (must be :r, :w, or :rw)", RSTRING_PTR(rb_funcall(interests, rb_intern("inspect"), 0)));
     }
 }
 
@@ -274,12 +277,12 @@ static void NIO_Monitor_update_interests(VALUE self, int interests)
     struct NIO_Monitor *monitor;
     Data_Get_Struct(self, struct NIO_Monitor, monitor);
 
-    if(NIO_Monitor_is_closed(self) == Qtrue) {
+    if (NIO_Monitor_is_closed(self) == Qtrue) {
         rb_raise(rb_eEOFError, "monitor is closed");
     }
 
-    if(interests) {
-        switch(interests) {
+    if (interests) {
+        switch (interests) {
             case EV_READ:
                 interests_id = rb_intern("r");
                 break;
@@ -298,9 +301,9 @@ static void NIO_Monitor_update_interests(VALUE self, int interests)
         rb_ivar_set(self, rb_intern("interests"), Qnil);
     }
 
-    if(monitor->interests != interests) {
+    if (monitor->interests != interests) {
         // If the monitor currently has interests, we should stop it.
-        if(monitor->interests) {
+        if (monitor->interests) {
             ev_io_stop(monitor->selector->ev_loop, &monitor->ev_io);
         }
 
@@ -309,7 +312,7 @@ static void NIO_Monitor_update_interests(VALUE self, int interests)
         ev_io_set(&monitor->ev_io, monitor->ev_io.fd, monitor->interests);
 
         // If we are interested in events, schedule the monitor back into the event loop:
-        if(monitor->interests) {
+        if (monitor->interests) {
             ev_io_start(monitor->selector->ev_loop, &monitor->ev_io);
         }
     }

data/ext/nio4r/nio4r.h

@@ -6,12 +6,11 @@
 #ifndef NIO4R_H
 #define NIO4R_H
 
+#include "libev.h"
 #include "ruby.h"
 #include "ruby/io.h"
-#include "libev.h"
 
-struct NIO_Selector
-{
+struct NIO_Selector {
     struct ev_loop *ev_loop;
     struct ev_timer timer; /* for timeouts */
     struct ev_io wakeup;
@@ -24,31 +23,27 @@ struct NIO_Selector
     VALUE ready_array;
 };
 
-struct NIO_callback_data
-{
+struct NIO_callback_data {
     VALUE *monitor;
     struct NIO_Selector *selector;
 };
 
-struct NIO_Monitor
-{
+struct NIO_Monitor {
     VALUE self;
     int interests, revents;
     struct ev_io ev_io;
     struct NIO_Selector *selector;
 };
 
-struct NIO_ByteBuffer
-{
+struct NIO_ByteBuffer {
     char *buffer;
     int position, limit, capacity, mark;
 };
 
-
 #ifdef GetReadFile
-# define FPTR_TO_FD(fptr) (fileno(GetReadFile(fptr)))
+#define FPTR_TO_FD(fptr) (fileno(GetReadFile(fptr)))
 #else
-# define FPTR_TO_FD(fptr) fptr->fd
+#define FPTR_TO_FD(fptr) fptr->fd
 #endif /* GetReadFile */
 
 /* Thunk between libev callbacks in NIO::Monitors and NIO::Selectors */

data/ext/nio4r/nio4r_ext.c

@@ -3,8 +3,8 @@
  * See LICENSE.txt for further details.
  */
 
-#include "nio4r.h"
 #include "../libev/ev.c"
+#include "nio4r.h"
 
 void Init_NIO_Selector();
 void Init_NIO_Monitor();

data/ext/nio4r/org/nio4r/ByteBuffer.java

@@ -1,6 +1,7 @@
 package org.nio4r;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.nio.channels.Channel;
 import java.nio.channels.SelectableChannel;
 import java.nio.channels.ReadableByteChannel;
@@ -25,6 +26,7 @@ import org.jruby.runtime.Block;
 created by Upekshej
  */
 public class ByteBuffer extends RubyObject {
+    private static final long serialVersionUID = -6903439483039149324L;
     private java.nio.ByteBuffer byteBuffer;
 
     public static RaiseException newOverflowError(ThreadContext context, String message) {

data/ext/nio4r/org/nio4r/Monitor.java

@@ -13,6 +13,7 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
 public class Monitor extends RubyObject {
+    private static final long serialVersionUID = -3733782997115074794L;
     private SelectionKey key;
     private RubyIO io;
     private IRubyObject interests, selector, value, closed;

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

@@ -7,7 +7,6 @@ import java.io.IOException;
 import java.nio.channels.Channel;
 import java.nio.channels.SelectableChannel;
 import java.nio.channels.SelectionKey;
-import java.nio.channels.CancelledKeyException;
 
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
@@ -21,9 +20,8 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.io.OpenFile;
 
-import org.nio4r.Monitor;
-
 public class Selector extends RubyObject {
+    private static final long serialVersionUID = -14562818539414873L;
     private java.nio.channels.Selector selector;
     private HashMap<SelectableChannel,SelectionKey> cancelledKeys;
     private volatile boolean wakeupFired;
@@ -45,7 +43,7 @@ public class Selector extends RubyObject {
 
     @JRubyMethod
     public IRubyObject initialize(ThreadContext context, IRubyObject backend) {
-        if(backend != context.runtime.newSymbol("java")) {
+        if(backend != context.runtime.newSymbol("java") && !backend.isNil()) {
             throw context.runtime.newArgumentError(":java is the only supported backend");
         }
 
@@ -203,15 +201,15 @@ public class Selector extends RubyObject {
             return context.nil;
         }
 
-        RubyArray array = null;
+        RubyArray<?> array = null;
 
         if(!block.isGiven()) {
             array = runtime.newArray(this.selector.selectedKeys().size());
         }
 
-        Iterator selectedKeys = this.selector.selectedKeys().iterator();
+        Iterator<SelectionKey> selectedKeys = this.selector.selectedKeys().iterator();
         while(selectedKeys.hasNext()) {
-            SelectionKey key = (SelectionKey)selectedKeys.next();
+            SelectionKey key = selectedKeys.next();
             processKey(key);
 
             selectedKeys.remove();
@@ -263,10 +261,10 @@ public class Selector extends RubyObject {
 
     /* Flush our internal buffer of cancelled keys */
     private void cancelKeys() {
-        Iterator cancelledKeys = this.cancelledKeys.entrySet().iterator();
+        Iterator<Map.Entry<SelectableChannel, SelectionKey>> cancelledKeys = this.cancelledKeys.entrySet().iterator();
         while(cancelledKeys.hasNext()) {
-            Map.Entry entry = (Map.Entry)cancelledKeys.next();
-            SelectionKey key = (SelectionKey)entry.getValue();
+            Map.Entry<SelectableChannel, SelectionKey> entry = cancelledKeys.next();
+            SelectionKey key = entry.getValue();
             key.cancel();
             cancelledKeys.remove();
         }