diff options
author | Samuel Williams <samuel.williams@oriontransfer.co.nz> | 2023-05-28 16:49:15 +0900 |
---|---|---|
committer | git <svn-admin@ruby-lang.org> | 2023-05-28 07:49:33 +0000 |
commit | 26dd9c5f0f8d17151ef721b46f94af0e6b3f484a (patch) | |
tree | 7b15feba2cc8dc9d539d453b52f490229f973901 /ext/io/nonblock | |
parent | 881757c03f28c30c02754ed367e3c5494f46e800 (diff) | |
download | ruby-26dd9c5f0f8d17151ef721b46f94af0e6b3f484a.tar.gz |
[ruby/io-nonblock] Remove usage of IO internals.
https://github.com/ruby/io-nonblock/commit/9772b6dcb6
Diffstat (limited to 'ext/io/nonblock')
-rw-r--r-- | ext/io/nonblock/extconf.rb | 2 | ||||
-rw-r--r-- | ext/io/nonblock/nonblock.c | 54 |
2 files changed, 33 insertions, 23 deletions
diff --git a/ext/io/nonblock/extconf.rb b/ext/io/nonblock/extconf.rb index d813a01e7c..d911fdca75 100644 --- a/ext/io/nonblock/extconf.rb +++ b/ext/io/nonblock/extconf.rb @@ -7,3 +7,5 @@ if have_macro("O_NONBLOCK", hdr) and (have_macro("F_GETFL", hdr) or have_macro("F_SETFL", hdr)) create_makefile(target) end + +have_function("rb_io_descriptor") diff --git a/ext/io/nonblock/nonblock.c b/ext/io/nonblock/nonblock.c index b8a40ff38e..3fc35e1a64 100644 --- a/ext/io/nonblock/nonblock.c +++ b/ext/io/nonblock/nonblock.c @@ -17,6 +17,16 @@ #endif #include <fcntl.h> +#ifndef HAVE_RB_IO_DESCRIPTOR +static int +rb_io_descriptor(VALUE io) +{ + rb_io_t *fptr; + GetOpenFile(io, fptr); + return fptr->fd; +} +#endif + #ifdef F_GETFL static int get_fcntl_flags(int fd) @@ -39,10 +49,8 @@ get_fcntl_flags(int fd) static VALUE rb_io_nonblock_p(VALUE io) { - rb_io_t *fptr; - GetOpenFile(io, fptr); - if (get_fcntl_flags(fptr->fd) & O_NONBLOCK) - return Qtrue; + if (get_fcntl_flags(rb_io_descriptor(io)) & O_NONBLOCK) + return Qtrue; return Qfalse; } #else @@ -122,15 +130,13 @@ io_nonblock_set(int fd, int f, int nb) * */ static VALUE -rb_io_nonblock_set(VALUE io, VALUE nb) +rb_io_nonblock_set(VALUE self, VALUE value) { - rb_io_t *fptr; - GetOpenFile(io, fptr); - if (RTEST(nb)) - rb_io_set_nonblock(fptr); - else - io_nonblock_set(fptr->fd, get_fcntl_flags(fptr->fd), RTEST(nb)); - return io; + int descriptor = rb_io_descriptor(self); + + io_nonblock_set(rb_io_descriptor(descriptor), get_fcntl_flags(descriptor), RTEST(value)); + + return self; } static VALUE @@ -152,23 +158,25 @@ io_nonblock_restore(VALUE arg) * The original mode is restored after the block is executed. */ static VALUE -rb_io_nonblock_block(int argc, VALUE *argv, VALUE io) +rb_io_nonblock_block(int argc, VALUE *argv, VALUE self) { int nb = 1; rb_io_t *fptr; - int f, restore[2]; - GetOpenFile(io, fptr); + int descriptor = rb_io_descriptor(self); + if (argc > 0) { - VALUE v; - rb_scan_args(argc, argv, "01", &v); - nb = RTEST(v); + VALUE v; + rb_scan_args(argc, argv, "01", &v); + nb = RTEST(v); } - f = get_fcntl_flags(fptr->fd); - restore[0] = fptr->fd; - restore[1] = f; - if (!io_nonblock_set(fptr->fd, f, nb)) - return rb_yield(io); + + int current_flags = get_fcntl_flags(descriptor); + int restore[2] = {descriptor, current_flags}; + + if (!io_nonblock_set(descriptor, current_flags, nb)) + return rb_yield(io); + return rb_ensure(rb_yield, io, io_nonblock_restore, (VALUE)restore); } #else |