nio4r 2.5.9 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1572a271d329a29e7168c04b8f3776a41f23f495227a0a41ab9f1cd80233f1d6
-  data.tar.gz: 6c7e944abd93038272299db034c3c67829d093e2ce4a75292eba4c654cd2ae0f
+  metadata.gz: ae8b5e59a799c0161b454b1e4dcd97becc5bdb0b835ec6becf2a3a4488b648b5
+  data.tar.gz: e5b186044e74c4ad7c3b9846d6244dd21938b831eb415eccb63a781a4ee5dc9e
 SHA512:
-  metadata.gz: 78e502f54f1eedeb948c412e9ecc5fa241c082b3ed292d9a50d1acbff76ee499904d70367eccb52db5c513f6bd91ac647846fa6cce6632ca9ba22c5d28a46682
-  data.tar.gz: 992198b186b8186e37bc84da3d89b1ddbae76ae9e8aaa45973111a8a9cd94e80c7b23ed9558449c409079b2b9c6cb1ca9edefa78ef5f8010c43a7c34ee000fc4
+  metadata.gz: c22f5d7466ede134956ab01ea87c4554ce38a950019519f0a7c4a9f16cbe81c5a338de488d885761bd49393cfd72bf20a857204db13b051d6f59f8e5bc52bc1d
+  data.tar.gz: 27152f810d81a2f94b7428a3662e991441adb4756e24cb09753addd8d00b1a3a6ea80a2e89580eac76ab5d3328fa368cb43147ccaa9432d70e74a771ce22c863

data/.mailmap

@@ -0,0 +1,16 @@
+Sadayuki Furuhashi <frsyuki@users.sourceforge.jp>
+Shannon Skipper <shannonskipper@gmail.com>
+Anatol Pomozov <anatol.pomozov@gmail.com>
+Hiroshi Shibata <shibata.hiroshi@gmail.com>
+John Thornton <ubergeek3141@gmail.com>
+Upekshe Jayasekera <usmj000@gmail.com>
+Upekshe Jayasekera <upekshej.11@cse.mrt.ac.lk>
+Usaku Nakamura <usa@garbagecollect.jp>
+Tomoya Ishida <tomoyapenguin@gmail.com>
+Tiago Cardoso <cardoso_tiago@hotmail.com>
+Ravil Bayramgalin <brainopia@evilmartians.com>
+Gregory Longtin <Greg.mpls@gmail.com>
+Gregory Longtin <Greg.mpls@gmail.com> <MSP-Greg@users.noreply.github.com>
+Elad Eyal <elad.eyal@intel.com>
+Boaz Segev <bo@bowild.com>
+Tao Luo <luotao.ruby@gmail.com>

data/Gemfile

@@ -6,8 +6,10 @@ gemspec
 
 gem "jruby-openssl" if defined? JRUBY_VERSION
 
-group :development do
-  gem "pry", require: false
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+  # gem "bake-modernize"
 end
 
 group :development, :test do

data/{CHANGES.md → changes.md}

@@ -1,3 +1,21 @@
+## 2.6.2
+
+* Convert NIO objects to TypedData API.
+
+## 2.6.1
+
+* Don't update `io` which is subsequently stored. Retain the original.
+
+## 2.6.0
+
+* Fix conversion loses int precision.
+* Avoid direct access to IO internals.
+* Resolve issue loading both nio and nio4r gems.
+
+## 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/examples/echo_server.rb

@@ -1,6 +1,13 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+# Released under the MIT License.
+# Copyright, 2012-2016, by Tony Arcieri.
+# Copyright, 2016, by Jun Aruga.
+# Copyright, 2019, by Zhang Kang.
+# Copyright, 2020, by Thomas Dziedzic.
+# Copyright, 2023, by Samuel Williams.
+
 $LOAD_PATH.push File.expand_path("../lib", __dir__)
 require "nio"
 require "socket"

data/ext/nio4r/bytebuffer.c

@@ -8,8 +8,8 @@ static VALUE cNIO_ByteBuffer_MarkUnsetError = Qnil;
 
 /* Allocator/deallocator */
 static VALUE NIO_ByteBuffer_allocate(VALUE klass);
-static void NIO_ByteBuffer_gc_mark(struct NIO_ByteBuffer *byteBuffer);
-static void NIO_ByteBuffer_free(struct NIO_ByteBuffer *byteBuffer);
+static void NIO_ByteBuffer_free(void *data);
+static size_t NIO_ByteBuffer_memsize(const void *data);
 
 /* Methods */
 static VALUE NIO_ByteBuffer_initialize(VALUE self, VALUE capacity);
@@ -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");
@@ -72,28 +92,46 @@ void Init_NIO_ByteBuffer()
     rb_define_method(cNIO_ByteBuffer, "inspect", NIO_ByteBuffer_inspect, 0);
 }
 
+static const rb_data_type_t NIO_ByteBuffer_type = {
+    "NIO::ByteBuffer",
+    {
+        NULL, // Nothing to mark
+        NIO_ByteBuffer_free,
+        NIO_ByteBuffer_memsize,
+    },
+    0,
+    0,
+    RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
+};
+
 static VALUE NIO_ByteBuffer_allocate(VALUE klass)
 {
     struct NIO_ByteBuffer *bytebuffer = (struct NIO_ByteBuffer *)xmalloc(sizeof(struct NIO_ByteBuffer));
     bytebuffer->buffer = NULL;
-    return Data_Wrap_Struct(klass, NIO_ByteBuffer_gc_mark, NIO_ByteBuffer_free, bytebuffer);
+    return TypedData_Wrap_Struct(klass, &NIO_ByteBuffer_type, bytebuffer);
 }
 
-static void NIO_ByteBuffer_gc_mark(struct NIO_ByteBuffer *buffer)
+static void NIO_ByteBuffer_free(void *data)
 {
+    struct NIO_ByteBuffer *buffer = (struct NIO_ByteBuffer *)data;
+    if (buffer->buffer)
+        xfree(buffer->buffer);
+    xfree(buffer);
 }
 
-static void NIO_ByteBuffer_free(struct NIO_ByteBuffer *buffer)
+static size_t NIO_ByteBuffer_memsize(const void *data)
 {
+    const struct NIO_ByteBuffer *buffer = (const struct NIO_ByteBuffer *)data;
+    size_t memsize = sizeof(struct NIO_ByteBuffer);
     if (buffer->buffer)
-        xfree(buffer->buffer);
-    xfree(buffer);
+        memsize += buffer->capacity;
+    return memsize;
 }
 
 static VALUE NIO_ByteBuffer_initialize(VALUE self, VALUE capacity)
 {
     struct NIO_ByteBuffer *buffer;
-    Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
+    TypedData_Get_Struct(self, struct NIO_ByteBuffer, &NIO_ByteBuffer_type, buffer);
 
     buffer->capacity = NUM2INT(capacity);
     buffer->buffer = xmalloc(buffer->capacity);
@@ -106,7 +144,7 @@ static VALUE NIO_ByteBuffer_initialize(VALUE self, VALUE capacity)
 static VALUE NIO_ByteBuffer_clear(VALUE self)
 {
     struct NIO_ByteBuffer *buffer;
-    Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
+    TypedData_Get_Struct(self, struct NIO_ByteBuffer, &NIO_ByteBuffer_type, buffer);
 
     memset(buffer->buffer, 0, buffer->capacity);
 
@@ -120,7 +158,7 @@ static VALUE NIO_ByteBuffer_clear(VALUE self)
 static VALUE NIO_ByteBuffer_get_position(VALUE self)
 {
     struct NIO_ByteBuffer *buffer;
-    Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
+    TypedData_Get_Struct(self, struct NIO_ByteBuffer, &NIO_ByteBuffer_type, buffer);
 
     return INT2NUM(buffer->position);
 }
@@ -129,7 +167,7 @@ static VALUE NIO_ByteBuffer_set_position(VALUE self, VALUE new_position)
 {
     int pos;
     struct NIO_ByteBuffer *buffer;
-    Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
+    TypedData_Get_Struct(self, struct NIO_ByteBuffer, &NIO_ByteBuffer_type, buffer);
 
     pos = NUM2INT(new_position);
 
@@ -153,7 +191,7 @@ static VALUE NIO_ByteBuffer_set_position(VALUE self, VALUE new_position)
 static VALUE NIO_ByteBuffer_get_limit(VALUE self)
 {
     struct NIO_ByteBuffer *buffer;
-    Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
+    TypedData_Get_Struct(self, struct NIO_ByteBuffer, &NIO_ByteBuffer_type, buffer);
 
     return INT2NUM(buffer->limit);
 }
@@ -162,7 +200,7 @@ static VALUE NIO_ByteBuffer_set_limit(VALUE self, VALUE new_limit)
 {
     int lim;
     struct NIO_ByteBuffer *buffer;
-    Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
+    TypedData_Get_Struct(self, struct NIO_ByteBuffer, &NIO_ByteBuffer_type, buffer);
 
     lim = NUM2INT(new_limit);
 
@@ -190,7 +228,7 @@ static VALUE NIO_ByteBuffer_set_limit(VALUE self, VALUE new_limit)
 static VALUE NIO_ByteBuffer_capacity(VALUE self)
 {
     struct NIO_ByteBuffer *buffer;
-    Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
+    TypedData_Get_Struct(self, struct NIO_ByteBuffer, &NIO_ByteBuffer_type, buffer);
 
     return INT2NUM(buffer->capacity);
 }
@@ -198,7 +236,7 @@ static VALUE NIO_ByteBuffer_capacity(VALUE self)
 static VALUE NIO_ByteBuffer_remaining(VALUE self)
 {
     struct NIO_ByteBuffer *buffer;
-    Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
+    TypedData_Get_Struct(self, struct NIO_ByteBuffer, &NIO_ByteBuffer_type, buffer);
 
     return INT2NUM(buffer->limit - buffer->position);
 }
@@ -206,7 +244,7 @@ static VALUE NIO_ByteBuffer_remaining(VALUE self)
 static VALUE NIO_ByteBuffer_full(VALUE self)
 {
     struct NIO_ByteBuffer *buffer;
-    Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
+    TypedData_Get_Struct(self, struct NIO_ByteBuffer, &NIO_ByteBuffer_type, buffer);
 
     return buffer->position == buffer->limit ? Qtrue : Qfalse;
 }
@@ -216,7 +254,7 @@ static VALUE NIO_ByteBuffer_get(int argc, VALUE *argv, VALUE self)
     int len;
     VALUE length, result;
     struct NIO_ByteBuffer *buffer;
-    Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
+    TypedData_Get_Struct(self, struct NIO_ByteBuffer, &NIO_ByteBuffer_type, buffer);
 
     rb_scan_args(argc, argv, "01", &length);
 
@@ -244,7 +282,7 @@ static VALUE NIO_ByteBuffer_fetch(VALUE self, VALUE index)
 {
     int i;
     struct NIO_ByteBuffer *buffer;
-    Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
+    TypedData_Get_Struct(self, struct NIO_ByteBuffer, &NIO_ByteBuffer_type, buffer);
 
     i = NUM2INT(index);
 
@@ -263,7 +301,7 @@ static VALUE NIO_ByteBuffer_put(VALUE self, VALUE string)
 {
     long length;
     struct NIO_ByteBuffer *buffer;
-    Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
+    TypedData_Get_Struct(self, struct NIO_ByteBuffer, &NIO_ByteBuffer_type, buffer);
 
     StringValue(string);
     length = RSTRING_LEN(string);
@@ -281,19 +319,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);
+    TypedData_Get_Struct(self, struct NIO_ByteBuffer, &NIO_ByteBuffer_type, buffer);
+
+    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 +343,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);
+    TypedData_Get_Struct(self, struct NIO_ByteBuffer, &NIO_ByteBuffer_type, buffer);
+    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,13 +372,13 @@ 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)
 {
     struct NIO_ByteBuffer *buffer;
-    Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
+    TypedData_Get_Struct(self, struct NIO_ByteBuffer, &NIO_ByteBuffer_type, buffer);
 
     buffer->limit = buffer->position;
     buffer->position = 0;
@@ -353,7 +390,7 @@ static VALUE NIO_ByteBuffer_flip(VALUE self)
 static VALUE NIO_ByteBuffer_rewind(VALUE self)
 {
     struct NIO_ByteBuffer *buffer;
-    Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
+    TypedData_Get_Struct(self, struct NIO_ByteBuffer, &NIO_ByteBuffer_type, buffer);
 
     buffer->position = 0;
     buffer->mark = MARK_UNSET;
@@ -364,7 +401,7 @@ static VALUE NIO_ByteBuffer_rewind(VALUE self)
 static VALUE NIO_ByteBuffer_mark(VALUE self)
 {
     struct NIO_ByteBuffer *buffer;
-    Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
+    TypedData_Get_Struct(self, struct NIO_ByteBuffer, &NIO_ByteBuffer_type, buffer);
 
     buffer->mark = buffer->position;
     return self;
@@ -373,7 +410,7 @@ static VALUE NIO_ByteBuffer_mark(VALUE self)
 static VALUE NIO_ByteBuffer_reset(VALUE self)
 {
     struct NIO_ByteBuffer *buffer;
-    Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
+    TypedData_Get_Struct(self, struct NIO_ByteBuffer, &NIO_ByteBuffer_type, buffer);
 
     if (buffer->mark < 0) {
         rb_raise(cNIO_ByteBuffer_MarkUnsetError, "mark has not been set");
@@ -387,7 +424,7 @@ static VALUE NIO_ByteBuffer_reset(VALUE self)
 static VALUE NIO_ByteBuffer_compact(VALUE self)
 {
     struct NIO_ByteBuffer *buffer;
-    Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
+    TypedData_Get_Struct(self, struct NIO_ByteBuffer, &NIO_ByteBuffer_type, buffer);
 
     memmove(buffer->buffer, buffer->buffer + buffer->position, buffer->limit - buffer->position);
     buffer->position = buffer->limit - buffer->position;
@@ -400,7 +437,7 @@ static VALUE NIO_ByteBuffer_each(VALUE self)
 {
     int i;
     struct NIO_ByteBuffer *buffer;
-    Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
+    TypedData_Get_Struct(self, struct NIO_ByteBuffer, &NIO_ByteBuffer_type, buffer);
 
     if (rb_block_given_p()) {
         for (i = 0; i < buffer->limit; i++) {
@@ -416,7 +453,7 @@ static VALUE NIO_ByteBuffer_each(VALUE self)
 static VALUE NIO_ByteBuffer_inspect(VALUE self)
 {
     struct NIO_ByteBuffer *buffer;
-    Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
+    TypedData_Get_Struct(self, struct NIO_ByteBuffer, &NIO_ByteBuffer_type, buffer);
 
     return rb_sprintf(
         "#<%s:%p @position=%d @limit=%d @capacity=%d>",

data/ext/nio4r/extconf.rb

@@ -1,5 +1,19 @@
 # frozen_string_literal: true
 
+# Released under the MIT License.
+# Copyright, 2011-2020, by Tony Arcieri.
+# Copyright, 2014, by Hiroshi Shibata.
+# Copyright, 2014, by Sergey Avseyev.
+# Copyright, 2015, by Daniel Berger.
+# Copyright, 2017, by Jun Aruga.
+# Copyright, 2017, by Usaku Nakamura.
+# Copyright, 2017, by Lars Kanis.
+# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2020, by Gregory Longtin.
+# Copyright, 2020, by Boaz Segev.
+# Copyright, 2020, by Joao Fernandes.
+# Copyright, 2021, by Jeffrey Martin.
+
 require "rubygems"
 
 # Write a dummy Makefile on Windows because we use the pure Ruby implementation there
@@ -16,6 +30,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

@@ -11,8 +11,8 @@ static VALUE cNIO_Monitor = Qnil;
 
 /* Allocator/deallocator */
 static VALUE NIO_Monitor_allocate(VALUE klass);
-static void NIO_Monitor_mark(struct NIO_Monitor *monitor);
-static void NIO_Monitor_free(struct NIO_Monitor *monitor);
+static void NIO_Monitor_mark(void *data);
+static size_t NIO_Monitor_memsize(const void *data);
 
 /* Methods */
 static VALUE NIO_Monitor_initialize(VALUE self, VALUE selector, VALUE io, VALUE interests);
@@ -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()
 {
@@ -58,22 +70,36 @@ void Init_NIO_Monitor()
     rb_define_method(cNIO_Monitor, "writeable?", NIO_Monitor_is_writable, 0);
 }
 
+static const rb_data_type_t NIO_Monitor_type = {
+    "NIO::Monitor",
+    {
+        NIO_Monitor_mark,
+        RUBY_TYPED_DEFAULT_FREE,
+        NIO_Monitor_memsize,
+    },
+    0,
+    0,
+    RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
+};
+
 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);
+    return TypedData_Wrap_Struct(klass, &NIO_Monitor_type, monitor);
 }
 
-static void NIO_Monitor_mark(struct NIO_Monitor *monitor)
+static void NIO_Monitor_mark(void *data)
 {
+    struct NIO_Monitor *monitor = (struct NIO_Monitor *)data;
     rb_gc_mark(monitor->self);
 }
 
-static void NIO_Monitor_free(struct NIO_Monitor *monitor)
+static size_t NIO_Monitor_memsize(const void *data)
 {
-    xfree(monitor);
+    const struct NIO_Monitor *monitor = (const struct NIO_Monitor *)data;
+    return sizeof(*monitor);
 }
 
 static VALUE NIO_Monitor_initialize(VALUE self, VALUE io, VALUE interests, VALUE selector_obj)
@@ -81,11 +107,10 @@ 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);
 
-    Data_Get_Struct(self, struct NIO_Monitor, monitor);
+    TypedData_Get_Struct(self, struct NIO_Monitor, &NIO_Monitor_type, monitor);
 
     if (interests_id == rb_intern("r")) {
         monitor->interests = EV_READ;
@@ -97,16 +122,16 @@ 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);
+    int descriptor = rb_io_descriptor(rb_convert_type(io, T_FILE, "IO", "to_io"));
+    ev_io_init(&monitor->ev_io, NIO_Selector_monitor_callback, descriptor, monitor->interests);
 
     rb_ivar_set(self, rb_intern("io"), io);
     rb_ivar_set(self, rb_intern("interests"), interests);
     rb_ivar_set(self, rb_intern("selector"), selector_obj);
 
-    Data_Get_Struct(selector_obj, struct NIO_Selector, selector);
+    selector = NIO_Selector_unwrap(selector_obj);
 
-    monitor->self = self;
+    RB_OBJ_WRITE(self, &monitor->self, self);
     monitor->ev_io.data = (void *)monitor;
 
     /* We can safely hang onto this as we also hang onto a reference to the
@@ -124,7 +149,7 @@ static VALUE NIO_Monitor_close(int argc, VALUE *argv, VALUE self)
 {
     VALUE deregister, selector;
     struct NIO_Monitor *monitor;
-    Data_Get_Struct(self, struct NIO_Monitor, monitor);
+    TypedData_Get_Struct(self, struct NIO_Monitor, &NIO_Monitor_type, monitor);
 
     rb_scan_args(argc, argv, "01", &deregister);
     selector = rb_ivar_get(self, rb_intern("selector"));
@@ -150,7 +175,7 @@ static VALUE NIO_Monitor_close(int argc, VALUE *argv, VALUE self)
 static VALUE NIO_Monitor_is_closed(VALUE self)
 {
     struct NIO_Monitor *monitor;
-    Data_Get_Struct(self, struct NIO_Monitor, monitor);
+    TypedData_Get_Struct(self, struct NIO_Monitor, &NIO_Monitor_type, monitor);
 
     return monitor->selector == 0 ? Qtrue : Qfalse;
 }
@@ -179,10 +204,10 @@ static VALUE NIO_Monitor_set_interests(VALUE self, VALUE interests)
 static VALUE NIO_Monitor_add_interest(VALUE self, VALUE interest)
 {
     struct NIO_Monitor *monitor;
-    Data_Get_Struct(self, struct NIO_Monitor, monitor);
+    TypedData_Get_Struct(self, struct NIO_Monitor, &NIO_Monitor_type, 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"));
 }
@@ -190,10 +215,10 @@ static VALUE NIO_Monitor_add_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);
+    TypedData_Get_Struct(self, struct NIO_Monitor, &NIO_Monitor_type, 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"));
 }
@@ -216,7 +241,7 @@ static VALUE NIO_Monitor_set_value(VALUE self, VALUE obj)
 static VALUE NIO_Monitor_readiness(VALUE self)
 {
     struct NIO_Monitor *monitor;
-    Data_Get_Struct(self, struct NIO_Monitor, monitor);
+    TypedData_Get_Struct(self, struct NIO_Monitor, &NIO_Monitor_type, monitor);
 
     if ((monitor->revents & (EV_READ | EV_WRITE)) == (EV_READ | EV_WRITE)) {
         return ID2SYM(rb_intern("rw"));
@@ -232,7 +257,7 @@ static VALUE NIO_Monitor_readiness(VALUE self)
 static VALUE NIO_Monitor_is_readable(VALUE self)
 {
     struct NIO_Monitor *monitor;
-    Data_Get_Struct(self, struct NIO_Monitor, monitor);
+    TypedData_Get_Struct(self, struct NIO_Monitor, &NIO_Monitor_type, monitor);
 
     if (monitor->revents & EV_READ) {
         return Qtrue;
@@ -244,7 +269,7 @@ static VALUE NIO_Monitor_is_readable(VALUE self)
 static VALUE NIO_Monitor_is_writable(VALUE self)
 {
     struct NIO_Monitor *monitor;
-    Data_Get_Struct(self, struct NIO_Monitor, monitor);
+    TypedData_Get_Struct(self, struct NIO_Monitor, &NIO_Monitor_type, monitor);
 
     if (monitor->revents & EV_WRITE) {
         return Qtrue;
@@ -275,7 +300,7 @@ static void NIO_Monitor_update_interests(VALUE self, int interests)
 {
     ID interests_id;
     struct NIO_Monitor *monitor;
-    Data_Get_Struct(self, struct NIO_Monitor, monitor);
+    TypedData_Get_Struct(self, struct NIO_Monitor, &NIO_Monitor_type, monitor);
 
     if (NIO_Monitor_is_closed(self) == Qtrue) {
         rb_raise(rb_eEOFError, "monitor is closed");

data/ext/nio4r/nio4r.h

@@ -40,11 +40,7 @@ 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 */
+struct NIO_Selector *NIO_Selector_unwrap(VALUE selector);
 
 /* 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);