From 6f8b0e9bb01137ebd5cddb411a9cbf5156de9da5 Mon Sep 17 00:00:00 2001 From: akr Date: Fri, 14 Feb 2014 15:16:31 +0000 Subject: * 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 --- thread.c | 122 +-------------------------------------------------------------- 1 file changed, 1 insertion(+), 121 deletions(-) (limited to 'thread.c') diff --git a/thread.c b/thread.c index b1dcc5bbde..73261be711 100644 --- a/thread.c +++ b/thread.c @@ -1099,15 +1099,6 @@ sleep_wait_for_interrupt(rb_thread_t *th, double sleepsec, int spurious_check) sleep_timeval(th, double2timeval(sleepsec), spurious_check); } -static void -sleep_for_polling(rb_thread_t *th) -{ - struct timeval time; - time.tv_sec = 0; - time.tv_usec = 100 * 1000; /* 0.1 sec */ - sleep_timeval(th, time, 1); -} - void rb_thread_wait_for(struct timeval time) { @@ -1115,16 +1106,6 @@ rb_thread_wait_for(struct timeval time) sleep_timeval(th, time, 1); } -void -rb_thread_polling(void) -{ - if (!rb_thread_alone()) { - rb_thread_t *th = GET_THREAD(); - RUBY_VM_CHECK_INTS_BLOCKING(th); - sleep_for_polling(th); - } -} - /* * CAUTION: This function causes thread switching. * rb_thread_check_ints() check ruby's interrupts. @@ -1225,26 +1206,6 @@ blocking_region_end(rb_thread_t *th, struct rb_blocking_region_buffer *region) } } -struct rb_blocking_region_buffer * -rb_thread_blocking_region_begin(void) -{ - rb_thread_t *th = GET_THREAD(); - struct rb_blocking_region_buffer *region = ALLOC(struct rb_blocking_region_buffer); - blocking_region_begin(th, region, ubf_select, th, FALSE); - return region; -} - -void -rb_thread_blocking_region_end(struct rb_blocking_region_buffer *region) -{ - int saved_errno = errno; - rb_thread_t *th = ruby_thread_from_native(); - blocking_region_end(th, region); - xfree(region); - RUBY_VM_CHECK_INTS_BLOCKING(th); - errno = saved_errno; -} - static void * call_without_gvl(void *(*func)(void *), void *data1, rb_unblock_function_t *ubf, void *data2, int fail_if_interrupted) @@ -1406,19 +1367,10 @@ rb_thread_io_blocking_region(rb_blocking_function_t *func, void *data1, int fd) return val; } -VALUE -rb_thread_blocking_region( - rb_blocking_function_t *func, void *data1, - rb_unblock_function_t *ubf, void *data2) -{ - void *(*f)(void*) = (void *(*)(void*))func; - return (VALUE)rb_thread_call_without_gvl(f, data1, ubf, data2); -} - /* * rb_thread_call_with_gvl - re-enter the Ruby world after GVL release. * - * After releasing GVL using rb_thread_blocking_region() or + * After releasing GVL using * rb_thread_call_without_gvl() you can not access Ruby values or invoke * methods. If you need to access Ruby you must use this function * rb_thread_call_with_gvl(). @@ -3274,17 +3226,6 @@ rb_fd_copy(rb_fdset_t *dst, const fd_set *src, int max) memcpy(dst->fdset, src, size); } -static void -rb_fd_rcopy(fd_set *dst, rb_fdset_t *src) -{ - size_t size = howmany(rb_fd_max(src), NFDBITS) * sizeof(fd_mask); - - if (size > sizeof(fd_set)) { - rb_raise(rb_eArgError, "too large fdsets"); - } - memcpy(dst, rb_fd_ptr(src), sizeof(fd_set)); -} - void rb_fd_dup(rb_fdset_t *dst, const rb_fdset_t *src) { @@ -3348,21 +3289,6 @@ rb_fd_init_copy(rb_fdset_t *dst, rb_fdset_t *src) rb_fd_dup(dst, src); } -static void -rb_fd_rcopy(fd_set *dst, rb_fdset_t *src) -{ - int max = rb_fd_max(src); - - /* we assume src is the result of select() with dst, so dst should be - * larger or equal than src. */ - if (max > FD_SETSIZE || (UINT)max > dst->fd_count) { - rb_raise(rb_eArgError, "too large fdsets"); - } - - memcpy(dst->fd_array, src->fdset->fd_array, max); - dst->fd_count = max; -} - void rb_fd_term(rb_fdset_t *set) { @@ -3399,8 +3325,6 @@ rb_fd_set(int fd, rb_fdset_t *set) #define FD_CLR(i, f) rb_fd_clr((i), (f)) #define FD_ISSET(i, f) rb_fd_isset((i), (f)) -#else -#define rb_fd_rcopy(d, s) (*(d) = *(s)) #endif static int @@ -3513,50 +3437,6 @@ rb_thread_fd_writable(int fd) return TRUE; } -int -rb_thread_select(int max, fd_set * read, fd_set * write, fd_set * except, - struct timeval *timeout) -{ - rb_fdset_t fdsets[3]; - rb_fdset_t *rfds = NULL; - rb_fdset_t *wfds = NULL; - rb_fdset_t *efds = NULL; - int retval; - - if (read) { - rfds = &fdsets[0]; - rb_fd_init(rfds); - rb_fd_copy(rfds, read, max); - } - if (write) { - wfds = &fdsets[1]; - rb_fd_init(wfds); - rb_fd_copy(wfds, write, max); - } - if (except) { - efds = &fdsets[2]; - rb_fd_init(efds); - rb_fd_copy(efds, except, max); - } - - retval = rb_thread_fd_select(max, rfds, wfds, efds, timeout); - - if (rfds) { - rb_fd_rcopy(read, rfds); - rb_fd_term(rfds); - } - if (wfds) { - rb_fd_rcopy(write, wfds); - rb_fd_term(wfds); - } - if (efds) { - rb_fd_rcopy(except, efds); - rb_fd_term(efds); - } - - return retval; -} - int rb_thread_fd_select(int max, rb_fdset_t * read, rb_fdset_t * write, rb_fdset_t * except, struct timeval *timeout) -- cgit v1.2.3