From dad4c70f2ad570ad5095aac7a500fe5d9ff8c135 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 12 Nov 2025 21:17:24 +0900 Subject: [PATCH 1/3] Drop support for ruby 2.7 --- ext/io/wait/extconf.rb | 1 - ext/io/wait/wait.c | 90 +----------------------------------------- 2 files changed, 2 insertions(+), 89 deletions(-) diff --git a/ext/io/wait/extconf.rb b/ext/io/wait/extconf.rb index c199463..16d3f63 100644 --- a/ext/io/wait/extconf.rb +++ b/ext/io/wait/extconf.rb @@ -1,6 +1,5 @@ # frozen_string_literal: false require 'mkmf' -have_func("rb_io_wait", "ruby/io.h") have_func("rb_io_descriptor", "ruby/io.h") create_makefile("io/wait") diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c index 23d37e1..e439f45 100644 --- a/ext/io/wait/wait.c +++ b/ext/io/wait/wait.c @@ -14,33 +14,9 @@ #include "ruby.h" #include "ruby/io.h" -#ifndef HAVE_RB_IO_WAIT -static struct timeval * -get_timeout(int argc, VALUE *argv, struct timeval *timerec) -{ - VALUE timeout = Qnil; - rb_check_arity(argc, 0, 1); - if (!argc || NIL_P(timeout = argv[0])) { - return NULL; - } - else { - *timerec = rb_time_interval(timeout); - return timerec; - } -} - -static int -wait_for_single_fd(rb_io_t *fptr, int events, struct timeval *tv) -{ - int i = rb_wait_for_single_fd(fptr->fd, events, tv); - if (i < 0) - rb_sys_fail(0); - rb_io_check_closed(fptr); - return (i & events); -} -#endif +#ifndef RUBY_IO_WAIT_METHODS +/* Ruby 3.2+ can define these methods. This macro indicates that case. */ -#ifdef HAVE_RB_IO_WAIT static VALUE io_wait_event(VALUE io, int event, VALUE timeout, int return_io) { @@ -62,10 +38,6 @@ io_wait_event(VALUE io, int event, VALUE timeout, int return_io) return Qfalse; } } -#endif - -/* Ruby 3.2+ can define these methods. This macro indicates that case. */ -#ifndef RUBY_IO_WAIT_METHODS /* * call-seq: @@ -83,30 +55,16 @@ static VALUE io_wait_readable(int argc, VALUE *argv, VALUE io) { rb_io_t *fptr; -#ifndef HAVE_RB_IO_WAIT - struct timeval timerec; - struct timeval *tv; -#endif GetOpenFile(io, fptr); rb_io_check_char_readable(fptr); -#ifndef HAVE_RB_IO_WAIT - tv = get_timeout(argc, argv, &timerec); -#endif if (rb_io_read_pending(fptr)) return Qtrue; -#ifndef HAVE_RB_IO_WAIT - if (wait_for_single_fd(fptr, RB_WAITFD_IN, tv)) { - return io; - } - return Qnil; -#else rb_check_arity(argc, 0, 1); VALUE timeout = (argc == 1 ? argv[0] : Qnil); return io_wait_event(io, RUBY_IO_READABLE, timeout, 1); -#endif } /* @@ -123,29 +81,16 @@ static VALUE io_wait_writable(int argc, VALUE *argv, VALUE io) { rb_io_t *fptr; -#ifndef HAVE_RB_IO_WAIT - struct timeval timerec; - struct timeval *tv; -#endif GetOpenFile(io, fptr); rb_io_check_writable(fptr); -#ifndef HAVE_RB_IO_WAIT - tv = get_timeout(argc, argv, &timerec); - if (wait_for_single_fd(fptr, RB_WAITFD_OUT, tv)) { - return io; - } - return Qnil; -#else rb_check_arity(argc, 0, 1); VALUE timeout = (argc == 1 ? argv[0] : Qnil); return io_wait_event(io, RUBY_IO_WRITABLE, timeout, 1); -#endif } -#ifdef HAVE_RB_IO_WAIT /* * call-seq: * io.wait_priority -> truthy or falsy @@ -172,7 +117,6 @@ io_wait_priority(int argc, VALUE *argv, VALUE io) return io_wait_event(io, RUBY_IO_PRIORITY, timeout, 1); } -#endif static int wait_mode_sym(VALUE mode) @@ -208,7 +152,6 @@ wait_mode_sym(VALUE mode) return 0; } -#ifdef HAVE_RB_IO_WAIT static inline rb_io_event_t io_event_from_value(VALUE value) { @@ -218,7 +161,6 @@ io_event_from_value(VALUE value) return events; } -#endif /* * call-seq: @@ -246,31 +188,6 @@ io_event_from_value(VALUE value) static VALUE io_wait(int argc, VALUE *argv, VALUE io) { -#ifndef HAVE_RB_IO_WAIT - rb_io_t *fptr; - struct timeval timerec; - struct timeval *tv = NULL; - int event = 0; - int i; - - GetOpenFile(io, fptr); - for (i = 0; i < argc; ++i) { - if (SYMBOL_P(argv[i])) { - event |= wait_mode_sym(argv[i]); - } - else { - *(tv = &timerec) = rb_time_interval(argv[i]); - } - } - /* rb_time_interval() and might_mode() might convert the argument */ - rb_io_check_closed(fptr); - if (!event) event = RB_WAITFD_IN; - if ((event & RB_WAITFD_IN) && rb_io_read_pending(fptr)) - return Qtrue; - if (wait_for_single_fd(fptr, event, tv)) - return io; - return Qnil; -#else VALUE timeout = Qundef; rb_io_event_t events = 0; int i, return_io = 0; @@ -317,7 +234,6 @@ io_wait(int argc, VALUE *argv, VALUE io) } return io_wait_event(io, events, timeout, return_io); -#endif } #endif /* RUBY_IO_WAIT_METHODS */ @@ -338,8 +254,6 @@ Init_wait(void) rb_define_method(rb_cIO, "wait_readable", io_wait_readable, -1); rb_define_method(rb_cIO, "wait_writable", io_wait_writable, -1); -#ifdef HAVE_RB_IO_WAIT rb_define_method(rb_cIO, "wait_priority", io_wait_priority, -1); #endif -#endif } From 62626dae8c1cb17a7b78db04d909ef54fc3acd42 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 12 Nov 2025 21:30:01 +0900 Subject: [PATCH 2/3] Drop support for ruby 3.0 --- .github/workflows/test.yml | 2 +- ext/io/wait/extconf.rb | 1 - io-wait.gemspec | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 45427ac..ebff4af 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: uses: ruby/actions/.github/workflows/ruby_versions.yml@master with: engine: cruby - min_version: 3.0 + min_version: 3.1 test: needs: ruby-versions diff --git a/ext/io/wait/extconf.rb b/ext/io/wait/extconf.rb index 16d3f63..00c455a 100644 --- a/ext/io/wait/extconf.rb +++ b/ext/io/wait/extconf.rb @@ -1,5 +1,4 @@ # frozen_string_literal: false require 'mkmf' -have_func("rb_io_descriptor", "ruby/io.h") create_makefile("io/wait") diff --git a/io-wait.gemspec b/io-wait.gemspec index 4a79131..895063a 100644 --- a/io-wait.gemspec +++ b/io-wait.gemspec @@ -10,7 +10,7 @@ Gem::Specification.new do |spec| spec.description = %q{Waits until IO is readable or writable without blocking.} spec.homepage = "https://github.com/ruby/io-wait" spec.licenses = ["Ruby", "BSD-2-Clause"] - spec.required_ruby_version = Gem::Requirement.new(">= 3.0") + spec.required_ruby_version = Gem::Requirement.new(">= 3.1") spec.metadata["homepage_uri"] = spec.homepage spec.metadata["source_code_uri"] = spec.homepage From 33efb55d0ee6d7bfb5f97df7a768223ab155c796 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 12 Nov 2025 21:32:04 +0900 Subject: [PATCH 3/3] Drop support for ruby 3.1 --- .github/workflows/test.yml | 2 +- ext/io/wait/wait.c | 230 ------------------------------------- io-wait.gemspec | 2 +- 3 files changed, 2 insertions(+), 232 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ebff4af..7e0b91d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: uses: ruby/actions/.github/workflows/ruby_versions.yml@master with: engine: cruby - min_version: 3.1 + min_version: 3.2 test: needs: ruby-versions diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c index e439f45..86b7d25 100644 --- a/ext/io/wait/wait.c +++ b/ext/io/wait/wait.c @@ -14,229 +14,6 @@ #include "ruby.h" #include "ruby/io.h" -#ifndef RUBY_IO_WAIT_METHODS -/* Ruby 3.2+ can define these methods. This macro indicates that case. */ - -static VALUE -io_wait_event(VALUE io, int event, VALUE timeout, int return_io) -{ - VALUE result = rb_io_wait(io, RB_INT2NUM(event), timeout); - - if (!RB_TEST(result)) { - return Qnil; - } - - int mask = RB_NUM2INT(result); - - if (mask & event) { - if (return_io) - return io; - else - return result; - } - else { - return Qfalse; - } -} - -/* - * call-seq: - * io.wait_readable -> truthy or falsy - * io.wait_readable(timeout) -> truthy or falsy - * - * Waits until IO is readable and returns a truthy value, or a falsy - * value when times out. Returns a truthy value immediately when - * buffered data is available. - * - * You must require 'io/wait' to use this method. - */ - -static VALUE -io_wait_readable(int argc, VALUE *argv, VALUE io) -{ - rb_io_t *fptr; - - GetOpenFile(io, fptr); - rb_io_check_char_readable(fptr); - - if (rb_io_read_pending(fptr)) return Qtrue; - - rb_check_arity(argc, 0, 1); - VALUE timeout = (argc == 1 ? argv[0] : Qnil); - - return io_wait_event(io, RUBY_IO_READABLE, timeout, 1); -} - -/* - * call-seq: - * io.wait_writable -> truthy or falsy - * io.wait_writable(timeout) -> truthy or falsy - * - * Waits until IO is writable and returns a truthy value or a falsy - * value when times out. - * - * You must require 'io/wait' to use this method. - */ -static VALUE -io_wait_writable(int argc, VALUE *argv, VALUE io) -{ - rb_io_t *fptr; - - GetOpenFile(io, fptr); - rb_io_check_writable(fptr); - - rb_check_arity(argc, 0, 1); - VALUE timeout = (argc == 1 ? argv[0] : Qnil); - - return io_wait_event(io, RUBY_IO_WRITABLE, timeout, 1); -} - -/* - * call-seq: - * io.wait_priority -> truthy or falsy - * io.wait_priority(timeout) -> truthy or falsy - * - * Waits until IO is priority and returns a truthy value or a falsy - * value when times out. Priority data is sent and received using - * the Socket::MSG_OOB flag and is typically limited to streams. - * - * You must require 'io/wait' to use this method. - */ -static VALUE -io_wait_priority(int argc, VALUE *argv, VALUE io) -{ - rb_io_t *fptr = NULL; - - RB_IO_POINTER(io, fptr); - rb_io_check_char_readable(fptr); - - if (rb_io_read_pending(fptr)) return Qtrue; - - rb_check_arity(argc, 0, 1); - VALUE timeout = argc == 1 ? argv[0] : Qnil; - - return io_wait_event(io, RUBY_IO_PRIORITY, timeout, 1); -} - -static int -wait_mode_sym(VALUE mode) -{ - if (mode == ID2SYM(rb_intern("r"))) { - return RB_WAITFD_IN; - } - if (mode == ID2SYM(rb_intern("read"))) { - return RB_WAITFD_IN; - } - if (mode == ID2SYM(rb_intern("readable"))) { - return RB_WAITFD_IN; - } - if (mode == ID2SYM(rb_intern("w"))) { - return RB_WAITFD_OUT; - } - if (mode == ID2SYM(rb_intern("write"))) { - return RB_WAITFD_OUT; - } - if (mode == ID2SYM(rb_intern("writable"))) { - return RB_WAITFD_OUT; - } - if (mode == ID2SYM(rb_intern("rw"))) { - return RB_WAITFD_IN|RB_WAITFD_OUT; - } - if (mode == ID2SYM(rb_intern("read_write"))) { - return RB_WAITFD_IN|RB_WAITFD_OUT; - } - if (mode == ID2SYM(rb_intern("readable_writable"))) { - return RB_WAITFD_IN|RB_WAITFD_OUT; - } - rb_raise(rb_eArgError, "unsupported mode: %"PRIsVALUE, mode); - return 0; -} - -static inline rb_io_event_t -io_event_from_value(VALUE value) -{ - int events = RB_NUM2INT(value); - - if (events <= 0) rb_raise(rb_eArgError, "Events must be positive integer!"); - - return events; -} - -/* - * call-seq: - * io.wait(events, timeout) -> event mask, false or nil - * io.wait(*event_symbols[, timeout]) -> self, true, or false - * - * Waits until the IO becomes ready for the specified events and returns the - * subset of events that become ready, or a falsy value when times out. - * - * The events can be a bit mask of +IO::READABLE+, +IO::WRITABLE+ or - * +IO::PRIORITY+. - * - * Returns an event mask (truthy value) immediately when buffered data is - * available. - * - * The second form: if one or more event symbols (+:read+, +:write+, or - * +:read_write+) are passed, the event mask is the bit OR of the bitmask - * corresponding to those symbols. In this form, +timeout+ is optional, the - * order of the arguments is arbitrary, and returns +io+ if any of the - * events is ready. - * - * You must require 'io/wait' to use this method. - */ - -static VALUE -io_wait(int argc, VALUE *argv, VALUE io) -{ - VALUE timeout = Qundef; - rb_io_event_t events = 0; - int i, return_io = 0; - - if (argc != 2 || (RB_SYMBOL_P(argv[0]) || RB_SYMBOL_P(argv[1]))) { - /* We'd prefer to return the actual mask, but this form would return the io itself: */ - return_io = 1; - - /* Slow/messy path: */ - for (i = 0; i < argc; i += 1) { - if (RB_SYMBOL_P(argv[i])) { - events |= wait_mode_sym(argv[i]); - } - else if (timeout == Qundef) { - rb_time_interval(timeout = argv[i]); - } - else { - rb_raise(rb_eArgError, "timeout given more than once"); - } - } - - if (timeout == Qundef) timeout = Qnil; - - if (events == 0) { - events = RUBY_IO_READABLE; - } - } - else /* argc == 2 and neither are symbols */ { - /* This is the fast path: */ - events = io_event_from_value(argv[0]); - timeout = argv[1]; - } - - if (events & RUBY_IO_READABLE) { - rb_io_t *fptr = NULL; - RB_IO_POINTER(io, fptr); - - if (rb_io_read_pending(fptr)) { - /* This was the original behaviour: */ - if (return_io) return Qtrue; - /* New behaviour always returns an event mask: */ - else return RB_INT2NUM(RUBY_IO_READABLE); - } - } - - return io_wait_event(io, events, timeout, return_io); -} - -#endif /* RUBY_IO_WAIT_METHODS */ /* * IO wait methods @@ -249,11 +26,4 @@ Init_wait(void) RB_EXT_RACTOR_SAFE(true); #endif -#ifndef RUBY_IO_WAIT_METHODS - rb_define_method(rb_cIO, "wait", io_wait, -1); - - rb_define_method(rb_cIO, "wait_readable", io_wait_readable, -1); - rb_define_method(rb_cIO, "wait_writable", io_wait_writable, -1); - rb_define_method(rb_cIO, "wait_priority", io_wait_priority, -1); -#endif } diff --git a/io-wait.gemspec b/io-wait.gemspec index 895063a..ef46fbc 100644 --- a/io-wait.gemspec +++ b/io-wait.gemspec @@ -10,7 +10,7 @@ Gem::Specification.new do |spec| spec.description = %q{Waits until IO is readable or writable without blocking.} spec.homepage = "https://github.com/ruby/io-wait" spec.licenses = ["Ruby", "BSD-2-Clause"] - spec.required_ruby_version = Gem::Requirement.new(">= 3.1") + spec.required_ruby_version = Gem::Requirement.new(">= 3.2") spec.metadata["homepage_uri"] = spec.homepage spec.metadata["source_code_uri"] = spec.homepage