nio4r 2.5.9-java → 2.6.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 926dfd6f5d97b42c4f9123427c65d0981637bb6f20f4dc91777e1dae04b01b2d
-  data.tar.gz: 0b36d60e26ef7ae81ce236ce67e22fb8572318ed51a72dcdc6f9ba20cf78b0ee
+  metadata.gz: aa7ff0bd09ef7e889ab134788e01d7adee76d918828a04770b7870218b5d4209
+  data.tar.gz: 7e86a3c72cbc429069af232f7e01b526135a1d0318ff5ed26ed17fada28529cf
 SHA512:
-  metadata.gz: dd38f20089fd654f43604ce0b72a00918a0e412caf3d6ab39ce07f99635e22f597c0647db46793dda31b5b19545d36abb54241053391aba3255cd9cc9569bd76
-  data.tar.gz: af4fa2e1d9bda70ae2b9ada8a409d503fb4254acc9fcd57f212cf70549d9252cc5d95e3f80eee211a714ec897897d8e400d4655ae65f8a9028ead8fc514efd0f
+  metadata.gz: '0900a204af3c7da49f8f1e8752f91b611edaa5c7520cd5abd338c42018de9a543cc3ca9fd95134a2d22d1e71f6739e5908122a93638ca4fcbe42879a5217ce2a'
+  data.tar.gz: 53123e588d68838ce473aeae69891d1d54321e934df358421f40238485cc3881286b89f839cb7634c75cd65e50592eabf8d2d026a26bf627a35fa1c9c5b2587d

data/{CHANGES.md → changes.md}

@@ -1,3 +1,7 @@
+## 2.5.9 (2023-04-02)
+
+https://github.com/socketry/nio4r/compare/v2.5.8..v2.5.9
+
 ## 2.5.8 (2021-08-03)
 
 * [#276](https://github.com/socketry/nio4r/pull/276)

data/ext/nio4r/bytebuffer.c

@@ -36,6 +36,26 @@ static VALUE NIO_ByteBuffer_inspect(VALUE self);
 
 #define MARK_UNSET -1
 
+/* Compatibility for Ruby <= 3.1 */
+#ifndef HAVE_RB_IO_DESCRIPTOR
+static int
+io_descriptor_fallback(VALUE io)
+{
+    rb_io_t *fptr;
+    GetOpenFile(io, fptr);
+    return fptr->fd;
+}
+#define rb_io_descriptor io_descriptor_fallback
+#endif
+
+static void
+io_set_nonblock(VALUE io)
+{
+    rb_io_t *fptr;
+    GetOpenFile(io, fptr);
+    rb_io_set_nonblock(fptr);
+}
+
 void Init_NIO_ByteBuffer()
 {
     mNIO = rb_define_module("NIO");
@@ -281,19 +301,19 @@ static VALUE NIO_ByteBuffer_put(VALUE self, VALUE string)
 static VALUE NIO_ByteBuffer_read_from(VALUE self, VALUE io)
 {
     struct NIO_ByteBuffer *buffer;
-    rb_io_t *fptr;
     ssize_t nbytes, bytes_read;
 
     Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
-    GetOpenFile(rb_convert_type(io, T_FILE, "IO", "to_io"), fptr);
-    rb_io_set_nonblock(fptr);
+
+    io = rb_convert_type(io, T_FILE, "IO", "to_io");
+    io_set_nonblock(io);
 
     nbytes = buffer->limit - buffer->position;
     if (nbytes == 0) {
         rb_raise(cNIO_ByteBuffer_OverflowError, "buffer is full");
     }
 
-    bytes_read = read(FPTR_TO_FD(fptr), buffer->buffer + buffer->position, nbytes);
+    bytes_read = read(rb_io_descriptor(io), buffer->buffer + buffer->position, nbytes);
 
     if (bytes_read < 0) {
         if (errno == EAGAIN) {
@@ -305,25 +325,24 @@ static VALUE NIO_ByteBuffer_read_from(VALUE self, VALUE io)
 
     buffer->position += bytes_read;
 
-    return INT2NUM(bytes_read);
+    return SIZET2NUM(bytes_read);
 }
 
 static VALUE NIO_ByteBuffer_write_to(VALUE self, VALUE io)
 {
     struct NIO_ByteBuffer *buffer;
-    rb_io_t *fptr;
     ssize_t nbytes, bytes_written;
 
     Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
-    GetOpenFile(rb_convert_type(io, T_FILE, "IO", "to_io"), fptr);
-    rb_io_set_nonblock(fptr);
+    io = rb_convert_type(io, T_FILE, "IO", "to_io");
+    io_set_nonblock(io);
 
     nbytes = buffer->limit - buffer->position;
     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);
+    bytes_written = write(rb_io_descriptor(io), buffer->buffer + buffer->position, nbytes);
 
     if (bytes_written < 0) {
         if (errno == EAGAIN) {
@@ -335,7 +354,7 @@ static VALUE NIO_ByteBuffer_write_to(VALUE self, VALUE io)
 
     buffer->position += bytes_written;
 
-    return INT2NUM(bytes_written);
+    return SIZET2NUM(bytes_written);
 }
 
 static VALUE NIO_ByteBuffer_flip(VALUE self)

data/ext/nio4r/extconf.rb

@@ -16,6 +16,7 @@ end
 require "mkmf"
 
 have_header("unistd.h")
+have_func("rb_io_descriptor")
 
 $defs << "-DEV_USE_LINUXAIO"     if have_header("linux/aio_abi.h")
 $defs << "-DEV_USE_IOURING"      if have_header("linux/io_uring.h")

data/ext/nio4r/monitor.c

@@ -34,6 +34,18 @@ static VALUE NIO_Monitor_readiness(VALUE self);
 static int NIO_Monitor_symbol2interest(VALUE interests);
 static void NIO_Monitor_update_interests(VALUE self, int interests);
 
+/* Compatibility for Ruby <= 3.1 */
+#ifndef HAVE_RB_IO_DESCRIPTOR
+static int
+io_descriptor_fallback(VALUE io)
+{
+    rb_io_t *fptr;
+    GetOpenFile(io, fptr);
+    return fptr->fd;
+}
+#define rb_io_descriptor io_descriptor_fallback
+#endif
+
 /* Monitor control how a channel is being waited for by a monitor */
 void Init_NIO_Monitor()
 {
@@ -81,7 +93,6 @@ static VALUE NIO_Monitor_initialize(VALUE self, VALUE io, VALUE interests, VALUE
     struct NIO_Monitor *monitor;
     struct NIO_Selector *selector;
     ID interests_id;
-    rb_io_t *fptr;
 
     interests_id = SYM2ID(interests);
 
@@ -97,8 +108,8 @@ static VALUE NIO_Monitor_initialize(VALUE self, VALUE io, VALUE interests, VALUE
         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);
-    ev_io_init(&monitor->ev_io, NIO_Selector_monitor_callback, FPTR_TO_FD(fptr), monitor->interests);
+    io = rb_convert_type(io, T_FILE, "IO", "to_io");
+    ev_io_init(&monitor->ev_io, NIO_Selector_monitor_callback, rb_io_descriptor(io), monitor->interests);
 
     rb_ivar_set(self, rb_intern("io"), io);
     rb_ivar_set(self, rb_intern("interests"), interests);
@@ -182,7 +193,7 @@ static VALUE NIO_Monitor_add_interest(VALUE self, VALUE interest)
     Data_Get_Struct(self, struct NIO_Monitor, monitor);
 
     interest = monitor->interests | NIO_Monitor_symbol2interest(interest);
-    NIO_Monitor_update_interests(self, interest);
+    NIO_Monitor_update_interests(self, (int)interest);
 
     return rb_ivar_get(self, rb_intern("interests"));
 }
@@ -193,7 +204,7 @@ static VALUE NIO_Monitor_remove_interest(VALUE self, VALUE interest)
     Data_Get_Struct(self, struct NIO_Monitor, monitor);
 
     interest = monitor->interests & ~NIO_Monitor_symbol2interest(interest);
-    NIO_Monitor_update_interests(self, interest);
+    NIO_Monitor_update_interests(self, (int)interest);
 
     return rb_ivar_get(self, rb_intern("interests"));
 }

data/ext/nio4r/nio4r.h

@@ -40,12 +40,6 @@ struct NIO_ByteBuffer {
     int position, limit, capacity, mark;
 };
 
-#ifdef GetReadFile
-#define FPTR_TO_FD(fptr) (fileno(GetReadFile(fptr)))
-#else
-#define FPTR_TO_FD(fptr) fptr->fd
-#endif /* GetReadFile */
-
 /* Thunk between libev callbacks in NIO::Monitors and NIO::Selectors */
 void NIO_Selector_monitor_callback(struct ev_loop *ev_loop, struct ev_io *io, int revents);
 

data/lib/nio/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NIO
-  VERSION = "2.5.9"
+  VERSION = "2.6.0"
 end

data/lib/nio4r.rb

@@ -0,0 +1 @@
+require_relative "nio"

data/{README.md → readme.md}

@@ -93,6 +93,15 @@ rake release
 You might need to delete `Gemfile.lock` before trying to `bundle install`.
 
 ```
+# Ensure you have the correct JDK:
+pacman -Syu jdk-openjdk
+archlinux-java set java-19-openjdk
+
+# Ensure you are using jruby:
+chruby jruby
+bundle update
+
+# Build the package:
 rake clean
 rake compile
 rake release

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nio4r
 version: !ruby/object:Gem::Version
-  version: 2.5.9
+  version: 2.6.0
 platform: java
 authors:
 - Tony Arcieri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-02 00:00:00.000000000 Z
+date: 2023-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -50,10 +50,9 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- CHANGES.md
 - Gemfile
-- README.md
 - Rakefile
+- changes.md
 - examples/echo_server.rb
 - ext/libev/Changes
 - ext/libev/LICENSE
@@ -87,6 +86,7 @@ files:
 - lib/nio/monitor.rb
 - lib/nio/selector.rb
 - lib/nio/version.rb
+- lib/nio4r.rb
 - lib/nio4r_ext.jar
 - license.md
 - logo.png
@@ -94,6 +94,7 @@ files:
 - rakelib/extension.rake
 - rakelib/rspec.rake
 - rakelib/rubocop.rake
+- readme.md
 - spec/nio/acceptables_spec.rb
 - spec/nio/bytebuffer_spec.rb
 - spec/nio/monitor_spec.rb
@@ -110,8 +111,8 @@ licenses:
 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/2.5.9
-  source_code_uri: https://github.com/socketry/nio4r/tree/v2.5.9
+  documentation_uri: https://www.rubydoc.info/gems/nio4r/2.6.0
+  source_code_uri: https://github.com/socketry/nio4r/tree/v2.6.0
   wiki_uri: https://github.com/socketry/nio4r/wiki
 post_install_message:
 rdoc_options: []