diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-14 15:16:31 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-14 15:16:31 +0000 |
commit | 6f8b0e9bb01137ebd5cddb411a9cbf5156de9da5 (patch) | |
tree | 4fb3cacb9e65815334d42f6c4888ae1cf90b489d /ext | |
parent | f7cff3a940d7040416ebc4de2d532f2de46113af (diff) | |
download | ruby-6f8b0e9bb01137ebd5cddb411a9cbf5156de9da5.tar.gz |
* include/ruby/intern.h,
include/ruby/io.h,
include/ruby/ruby.h,
include/ruby/win32.h,
include/ruby/backward/rubysig.h,
bignum.c,
gc.c,
io.c,
process.c,
safe.c,
struct.c,
thread.c,
ext/socket/rubysocket.h,
ext/-test-/old_thread_select: Remove deprecated definitions
[ruby-core:60581] [Feature #9502]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44955 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/-test-/old_thread_select/depend | 4 | ||||
-rw-r--r-- | ext/-test-/old_thread_select/extconf.rb | 4 | ||||
-rw-r--r-- | ext/-test-/old_thread_select/old_thread_select.c | 75 | ||||
-rw-r--r-- | ext/socket/rubysocket.h | 1 |
4 files changed, 0 insertions, 84 deletions
diff --git a/ext/-test-/old_thread_select/depend b/ext/-test-/old_thread_select/depend deleted file mode 100644 index e786dc71d2..0000000000 --- a/ext/-test-/old_thread_select/depend +++ /dev/null @@ -1,4 +0,0 @@ -$(OBJS): $(HDRS) $(ruby_headers) \ - $(hdrdir)/ruby/io.h \ - $(hdrdir)/ruby/encoding.h \ - $(hdrdir)/ruby/oniguruma.h diff --git a/ext/-test-/old_thread_select/extconf.rb b/ext/-test-/old_thread_select/extconf.rb deleted file mode 100644 index 730d9ec901..0000000000 --- a/ext/-test-/old_thread_select/extconf.rb +++ /dev/null @@ -1,4 +0,0 @@ -$warnflags = "-Wno-deprecated-declarations" -$warnflags = "" unless try_compile("", $warnflags) - -create_makefile("-test-/old_thread_select/old_thread_select") diff --git a/ext/-test-/old_thread_select/old_thread_select.c b/ext/-test-/old_thread_select/old_thread_select.c deleted file mode 100644 index e374f02355..0000000000 --- a/ext/-test-/old_thread_select/old_thread_select.c +++ /dev/null @@ -1,75 +0,0 @@ -/* test case for deprecated C API */ -#include "ruby/ruby.h" -#include "ruby/io.h" - -static fd_set * array2fdset(fd_set *fds, VALUE ary, int *max) -{ - long i; - - if (NIL_P(ary)) - return NULL; - - FD_ZERO(fds); - Check_Type(ary, T_ARRAY); - for (i = 0; i < RARRAY_LEN(ary); i++) { - VALUE val = RARRAY_PTR(ary)[i]; - int fd; - - Check_Type(val, T_FIXNUM); - fd = FIX2INT(val); - if (fd >= *max) - *max = fd + 1; - FD_SET(fd, fds); - } - - return fds; -} - -static void fdset2array(VALUE dst, fd_set *fds, int max) -{ - int i; - - rb_ary_clear(dst); - - for (i = 0; i < max; i++) { - if (FD_ISSET(i, fds)) - rb_ary_push(dst, INT2NUM(i)); - } -} - -static VALUE -old_thread_select(VALUE klass, VALUE r, VALUE w, VALUE e, VALUE timeout) -{ - struct timeval tv; - struct timeval *tvp = NULL; - fd_set rfds, wfds, efds; - fd_set *rp, *wp, *ep; - int rc; - int max = 0; - - if (!NIL_P(timeout)) { - tv = rb_time_timeval(timeout); - tvp = &tv; - } - rp = array2fdset(&rfds, r, &max); - wp = array2fdset(&wfds, w, &max); - ep = array2fdset(&efds, e, &max); - rc = rb_thread_select(max, rp, wp, ep, tvp); - if (rc == -1) - rb_sys_fail("rb_wait_for_single_fd"); - - if (rp) - fdset2array(r, &rfds, max); - if (wp) - fdset2array(w, &wfds, max); - if (ep) - fdset2array(e, &efds, max); - return INT2NUM(rc); -} - -void -Init_old_thread_select(void) -{ - rb_define_singleton_method(rb_cIO, "old_thread_select", - old_thread_select, 4); -} diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h index d619959247..75bd03b88c 100644 --- a/ext/socket/rubysocket.h +++ b/ext/socket/rubysocket.h @@ -256,7 +256,6 @@ int Rconnect(); #include "constdefs.h" -#define BLOCKING_REGION(func, arg) (long)rb_thread_blocking_region((func), (arg), RUBY_UBF_IO, 0) #define BLOCKING_REGION_FD(func, arg) (long)rb_thread_io_blocking_region((func), (arg), (arg)->fd) #define SockAddrStringValue(v) rsock_sockaddr_string_value(&(v)) |