From 11dbedfaad4a9a9521ece2198a8dc491678b1902 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 29 Aug 2007 04:06:12 +0000 Subject: add tag v1_8_6_5001 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v1_8_6_5001@13304 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ruby_1_8_6/ext/io/wait/.cvsignore | 2 + ruby_1_8_6/ext/io/wait/extconf.rb | 17 +++++ ruby_1_8_6/ext/io/wait/lib/nonblock.rb | 23 ++++++ ruby_1_8_6/ext/io/wait/wait.c | 126 +++++++++++++++++++++++++++++++++ 4 files changed, 168 insertions(+) create mode 100644 ruby_1_8_6/ext/io/wait/.cvsignore create mode 100644 ruby_1_8_6/ext/io/wait/extconf.rb create mode 100644 ruby_1_8_6/ext/io/wait/lib/nonblock.rb create mode 100644 ruby_1_8_6/ext/io/wait/wait.c (limited to 'ruby_1_8_6/ext/io') diff --git a/ruby_1_8_6/ext/io/wait/.cvsignore b/ruby_1_8_6/ext/io/wait/.cvsignore new file mode 100644 index 0000000000..fc802ff1c2 --- /dev/null +++ b/ruby_1_8_6/ext/io/wait/.cvsignore @@ -0,0 +1,2 @@ +Makefile +mkmf.log diff --git a/ruby_1_8_6/ext/io/wait/extconf.rb b/ruby_1_8_6/ext/io/wait/extconf.rb new file mode 100644 index 0000000000..e8181d25f5 --- /dev/null +++ b/ruby_1_8_6/ext/io/wait/extconf.rb @@ -0,0 +1,17 @@ +require 'mkmf' +target = "io/wait" + +unless macro_defined?("DOSISH", "#include ") + fionread = %w[sys/ioctl.h sys/filio.h].find do |h| + have_macro("FIONREAD", h) + end + if fionread + $defs << "-DFIONREAD_HEADER=\"<#{fionread}>\"" + create_makefile(target) + end +else + if have_func("rb_w32_ioctlsocket", "ruby.h") + have_func("rb_w32_is_socket", "ruby.h") + create_makefile(target) + end +end diff --git a/ruby_1_8_6/ext/io/wait/lib/nonblock.rb b/ruby_1_8_6/ext/io/wait/lib/nonblock.rb new file mode 100644 index 0000000000..2103fdf25b --- /dev/null +++ b/ruby_1_8_6/ext/io/wait/lib/nonblock.rb @@ -0,0 +1,23 @@ +require "fcntl" +class IO + def nonblock? + (fcntl(Fcntl::F_GETFL) & File::NONBLOCK) != 0 + end + + def nonblock=(nb) + f = fcntl(Fcntl::F_GETFL) + if nb + f |= File::NONBLOCK + else + f &= ~File::NONBLOCK + end + fcntl(Fcntl::F_SETFL, f) + end + + def nonblock(nb = true) + nb, self.nonblock = nonblock?, nb + yield + ensure + self.nonblock = nb + end +end if defined?(Fcntl::F_GETFL) diff --git a/ruby_1_8_6/ext/io/wait/wait.c b/ruby_1_8_6/ext/io/wait/wait.c new file mode 100644 index 0000000000..61d6527b36 --- /dev/null +++ b/ruby_1_8_6/ext/io/wait/wait.c @@ -0,0 +1,126 @@ +/********************************************************************** + + io/wait.c - + + $Author$ + $Date$ + created at: Tue Aug 28 09:08:06 JST 2001 + + All the files in this distribution are covered under the Ruby's + license (see the file COPYING). + +**********************************************************************/ + +#include "ruby.h" +#include "rubyio.h" + +#include +#if defined(FIONREAD_HEADER) +#include FIONREAD_HEADER +#endif + +#ifdef HAVE_RB_W32_IOCTLSOCKET +#define ioctl ioctlsocket +#define ioctl_arg u_long +#define ioctl_arg2num(i) ULONG2NUM(i) +#else +#define ioctl_arg int +#define ioctl_arg2num(i) INT2NUM(i) +#endif + +#ifdef HAVE_RB_W32_IS_SOCKET +#define FIONREAD_POSSIBLE_P(fd) rb_w32_is_socket(fd) +#else +#define FIONREAD_POSSIBLE_P(fd) ((fd),Qtrue) +#endif + +static VALUE io_ready_p _((VALUE io)); +static VALUE io_wait _((int argc, VALUE *argv, VALUE io)); +void Init_wait _((void)); + +EXTERN struct timeval rb_time_interval _((VALUE time)); + +/* +=begin += IO wait methods. +=end + */ + +/* +=begin +--- IO#ready? + returns non-nil if input available without blocking, or nil. +=end +*/ +static VALUE +io_ready_p(io) + VALUE io; +{ + OpenFile *fptr; + FILE *fp; + ioctl_arg n; + + GetOpenFile(io, fptr); + rb_io_check_readable(fptr); + if (!FIONREAD_POSSIBLE_P(fileno(fptr->f))) return Qfalse; + fp = fptr->f; + if (feof(fp)) return Qfalse; + if (rb_read_pending(fp)) return Qtrue; + if (ioctl(fileno(fp), FIONREAD, &n)) rb_sys_fail(0); + if (n > 0) return ioctl_arg2num(n); + return Qnil; +} + +/* +=begin +--- IO#wait([timeout]) + waits until input available or timed out and returns self, or nil + when EOF reached. +=end +*/ +static VALUE +io_wait(argc, argv, io) + int argc; + VALUE *argv; + VALUE io; +{ + OpenFile *fptr; + fd_set rd; + FILE *fp; + int fd; + ioctl_arg n; + VALUE timeout; + struct timeval *tp, timerec; + + GetOpenFile(io, fptr); + rb_io_check_readable(fptr); + rb_scan_args(argc, argv, "01", &timeout); + if (NIL_P(timeout)) { + tp = 0; + } + else { + timerec = rb_time_interval(timeout); + tp = &timerec; + } + + fp = fptr->f; + if (feof(fp)) return Qfalse; + if (rb_read_pending(fp)) return Qtrue; + fd = fileno(fp); + FD_ZERO(&rd); + FD_SET(fd, &rd); + if (rb_thread_select(fd + 1, &rd, NULL, NULL, tp) < 0) + rb_sys_fail(0); + rb_io_check_closed(fptr); + if (!FIONREAD_POSSIBLE_P(fileno(fptr->f))) return Qfalse; + if (ioctl(fileno(fp), FIONREAD, &n)) rb_sys_fail(0); + if (n > 0) return io; + return Qnil; +} + +void +Init_wait() +{ + rb_define_method(rb_cIO, "ready?", io_ready_p, 0); + rb_define_method(rb_cIO, "wait", io_wait, -1); +} -- cgit v1.2.3