diff options
| -rw-r--r-- | ext/io/wait/extconf.rb | 1 | ||||
| -rw-r--r-- | 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 c199463ee7..16d3f6369b 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 23d37e1d3d..e439f45a29 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 } |