io-wait 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac9aac81de884ac5961c9415e4347be5f26ae3ef6e52854834c76a105e4f7388
-  data.tar.gz: 118b4011fcaa3f94a48ff2d3be11db1b2049375f709426b177ab5a9bc4799d7f
+  metadata.gz: e443d24e34f86142b3d27ca1a774e3828b63f445b00f94bd79273bb5583e4699
+  data.tar.gz: 5766517962c90389a10199460414a7088b8316edaa7f0854c98ebbdfd65ec4ba
 SHA512:
-  metadata.gz: 58cf2bc5cdc614eb7827a460decf662def72676011fbf9d4a853dfd71b66311dd10d81fcd100ac0a2d676d61009e6e3a4c80ac0f7c7d0d88f303a8a16f1510de
-  data.tar.gz: 700343ef7233d37f9e27d22bfab091af07e681e996619c8953553152b7b7598bb1843d2d969b8d268cac752ead4641b13f32380d2b5c43e8d4808e4176b64c89
+  metadata.gz: 526b1f255ac3a9999f9965a5ee35b4c43d32d0493bfaf2cb32e2ad8e4978f57c579574649986f6dfd77a5a2a058f7c5b2f8eaf2b83d8f31a9deac5fc24ffd55f
+  data.tar.gz: 0424cf27d9a11aeb5dc142963073b9624e9102465cd5358d5f92b9e1cb258b2b60f224d0ef43c1d49d6156d04c0f6a8e26dcb6d339adcfab1400d7c53bd5b1b7

data/Rakefile

@@ -3,14 +3,17 @@ require "rake/testtask"
 
 name = "io/wait"
 
+require 'rake/extensiontask'
+extask = Rake::ExtensionTask.new(name) do |x|
+  x.lib_dir << "/#{RUBY_VERSION}/#{x.platform}"
+end
 Rake::TestTask.new(:test) do |t|
+  t.libs << extask.lib_dir
   t.libs << "test/lib"
   t.ruby_opts << "-rhelper"
   t.test_files = FileList["test/**/test_*.rb"]
 end
 
-require 'rake/extensiontask'
-Rake::ExtensionTask.new(name)
 task :test => :compile
 
 task :default => :test

data/ext/io/wait/depend

@@ -2,7 +2,7 @@
 wait.o: $(RUBY_EXTCONF_H)
 wait.o: $(arch_hdrdir)/ruby/config.h
 wait.o: $(hdrdir)/ruby.h
-wait.o: $(hdrdir)/ruby/assert.h
+# wait.o: $(hdrdir)/ruby/assert.h # not in 2.6
 wait.o: $(hdrdir)/ruby/backward.h
 wait.o: $(hdrdir)/ruby/defines.h
 wait.o: $(hdrdir)/ruby/encoding.h

data/ext/io/wait/extconf.rb

@@ -2,6 +2,7 @@
 require 'mkmf'
 target = "io/wait"
 
+have_func("rb_io_wait")
 unless macro_defined?("DOSISH", "#include <ruby.h>")
   have_header(ioctl_h = "sys/ioctl.h") or ioctl_h = nil
   fionread = %w[sys/ioctl.h sys/filio.h sys/socket.h].find do |h|

data/ext/io/wait/wait.c

@@ -40,6 +40,37 @@
 #define FIONREAD_POSSIBLE_P(fd) ((void)(fd),Qtrue)
 #endif
 
+#ifndef HAVE_RB_IO_WAIT
+static VALUE io_ready_p _((VALUE io));
+static VALUE io_wait_readable _((int argc, VALUE *argv, VALUE io));
+static VALUE io_wait_writable _((int argc, VALUE *argv, VALUE io));
+void Init_wait _((void));
+
+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
+
 /*
  * call-seq:
  *   io.nread -> int
@@ -51,12 +82,13 @@
 static VALUE
 io_nread(VALUE io)
 {
-    rb_io_t *fptr = NULL;
+    rb_io_t *fptr;
+    int len;
     ioctl_arg n;
 
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
-    int len = rb_io_read_pending(fptr);
+    len = rb_io_read_pending(fptr);
     if (len > 0) return INT2FIX(len);
     if (!FIONREAD_POSSIBLE_P(fptr->fd)) return INT2FIX(0);
     if (ioctl(fptr->fd, FIONREAD, &n)) return INT2FIX(0);
@@ -64,6 +96,7 @@ io_nread(VALUE io)
     return INT2FIX(0);
 }
 
+#ifdef HAVE_RB_IO_WAIT
 static VALUE
 io_wait_event(VALUE io, int event, VALUE timeout)
 {
@@ -82,6 +115,7 @@ io_wait_event(VALUE io, int event, VALUE timeout)
 	return Qfalse;
     }
 }
+#endif
 
 /*
  * call-seq:
@@ -94,12 +128,22 @@ static VALUE
 io_ready_p(VALUE io)
 {
     rb_io_t *fptr;
+#ifndef HAVE_RB_IO_WAIT
+    struct timeval tv = {0, 0};
+#endif
 
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
     if (rb_io_read_pending(fptr)) return Qtrue;
 
-    return io_wait_event(io, RUBY_IO_READABLE, RB_INT2NUM(0));
+#ifndef HAVE_RB_IO_WAIT
+    if (wait_for_single_fd(fptr, RB_WAITFD_IN, &tv))
+	return Qtrue;
+#else
+    if (RTEST(io_wait_event(io, RUBY_IO_READABLE, RB_INT2NUM(0))))
+	return Qtrue;
+#endif
+    return Qfalse;
 }
 
 /*
@@ -115,17 +159,31 @@ io_ready_p(VALUE io)
 static VALUE
 io_wait_readable(int argc, VALUE *argv, VALUE io)
 {
-    rb_io_t *fptr = NULL;
+    rb_io_t *fptr;
+#ifndef HAVE_RB_IO_WAIT
+    struct timeval timerec;
+    struct timeval *tv;
+#endif
 
-    RB_IO_POINTER(io, fptr);
+    GetOpenFile(io, fptr);
     rb_io_check_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);
+#endif
 }
 
 /*
@@ -139,17 +197,30 @@ io_wait_readable(int argc, VALUE *argv, VALUE io)
 static VALUE
 io_wait_writable(int argc, VALUE *argv, VALUE io)
 {
-    rb_io_t *fptr = NULL;
+    rb_io_t *fptr;
+#ifndef HAVE_RB_IO_WAIT
+    struct timeval timerec;
+    struct timeval *tv;
+#endif
 
-    RB_IO_POINTER(io, fptr);
+    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);
+#endif
 }
 
+#ifdef HAVE_RB_IO_WAIT
 /*
  * call-seq:
  *   io.wait_priority          -> true or false
@@ -173,6 +244,7 @@ io_wait_priority(int argc, VALUE *argv, VALUE io)
 
     return io_wait_event(io, RUBY_IO_PRIORITY, timeout);
 }
+#endif
 
 static int
 wait_mode_sym(VALUE mode)
@@ -228,6 +300,31 @@ wait_mode_sym(VALUE mode)
 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;
 
@@ -264,6 +361,7 @@ io_wait(int argc, VALUE *argv, VALUE io)
     }
 
     return io_wait_event(io, events, timeout);
+#endif
 }
 
 /*
@@ -284,5 +382,7 @@ 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
 }

data/io-wait.gemspec

@@ -1,4 +1,4 @@
-_VERSION = "0.2.0"
+_VERSION = "0.2.1"
 
 Gem::Specification.new do |spec|
   spec.name          = "io-wait"
@@ -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.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage

data/rakelib/sync_tool.rake

@@ -0,0 +1,6 @@
+task :sync_tool do
+  require 'fileutils'
+  FileUtils.cp "../ruby/tool/lib/core_assertions.rb", "./test/lib"
+  FileUtils.cp "../ruby/tool/lib/envutil.rb", "./test/lib"
+  FileUtils.cp "../ruby/tool/lib/find_executable.rb", "./test/lib"
+end

data/rakelib/version.rake

@@ -12,7 +12,7 @@ class << (helper = Bundler::GemHelper.instance)
   end
 
   def commit_bump
-    sh(%W[git -C #{__dir__} commit -m bump\ up\ to\ #{gemspec.version}
+    sh(%W[git commit -m bump\ up\ to\ #{gemspec.version}
           #{gemspec.loaded_from}])
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: io-wait
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Nobu Nakada
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-21 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies: []
 description: Waits until IO is readable or writable without blocking.
 email:
@@ -28,6 +28,7 @@ files:
 - io-wait.gemspec
 - rakelib/changelogs.rake
 - rakelib/epoch.rake
+- rakelib/sync_tool.rake
 - rakelib/version.rake
 homepage: https://github.com/ruby/io-wait
 licenses:
@@ -44,7 +45,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="