ruby-changes:10735
From: akr <ko1@a...>
Date: Sat, 14 Feb 2009 19:03:32 +0900 (JST)
Subject: [ruby-changes:10735] Ruby:r22299 (ruby_1_8): * eval.c (rb_thread_schedule): handle EBADF of select as well.
akr 2009-02-14 18:58:46 +0900 (Sat, 14 Feb 2009) New Revision: 22299 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22299 Log: * eval.c (rb_thread_schedule): handle EBADF of select as well. [ruby-core:21264] Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/eval.c Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 22298) +++ ruby_1_8/ChangeLog (revision 22299) @@ -1,3 +1,8 @@ +Sat Feb 14 18:57:10 2009 Tanaka Akira <akr@f...> + + * eval.c (rb_thread_schedule): handle EBADF of select as well. + [ruby-core:21264] + Mon Feb 9 12:02:29 2009 Akinori MUSHA <knu@i...> * lib/open-uri.rb: add :read_timeout option. Index: ruby_1_8/eval.c =================================================================== --- ruby_1_8/eval.c (revision 22298) +++ ruby_1_8/eval.c (revision 22299) @@ -74,6 +74,15 @@ #include <time.h> +#if defined(HAVE_FCNTL_H) || defined(_WIN32) +#include <fcntl.h> +#elif defined(HAVE_SYS_FCNTL_H) +#include <sys/fcntl.h> +#endif +#ifdef __CYGWIN__ +#include <io.h> +#endif + #if defined(__BEOS__) && !defined(BONE) #include <net/socket.h> #endif @@ -11176,20 +11185,60 @@ #ifdef ERESTART if (e == ERESTART) goto again; #endif - FOREACH_THREAD_FROM(curr, th) { - if (th->wait_for & WAIT_SELECT) { - int v = 0; + if (e == EBADF) { + int badfd = -1; + int fd; + int dummy; + for (fd = 0; fd <= max; fd++) { + if ((FD_ISSET(fd, &readfds) || + FD_ISSET(fd, &writefds) || + FD_ISSET(fd, &exceptfds)) && + fcntl(fd, F_GETFD, &dummy) == -1 && + errno == EBADF) { + badfd = fd; + break; + } + } + if (badfd != -1) { + FOREACH_THREAD_FROM(curr, th) { + if (th->wait_for & WAIT_FD) { + if (th->fd == badfd) { + found = 1; + th->status = THREAD_RUNNABLE; + th->fd = 0; + break; + } + } + if (th->wait_for & WAIT_SELECT) { + if (FD_ISSET(badfd, &th->readfds) || + FD_ISSET(badfd, &th->writefds) || + FD_ISSET(badfd, &th->exceptfds)) { + found = 1; + th->status = THREAD_RUNNABLE; + th->select_value = -EBADF; + break; + } + } + } + END_FOREACH_FROM(curr, th); + } + } + else { + FOREACH_THREAD_FROM(curr, th) { + if (th->wait_for & WAIT_SELECT) { + int v = 0; - v |= find_bad_fds(&readfds, &th->readfds, th->fd); - v |= find_bad_fds(&writefds, &th->writefds, th->fd); - v |= find_bad_fds(&exceptfds, &th->exceptfds, th->fd); - if (v) { - th->select_value = n; - n = max; - } - } - } - END_FOREACH_FROM(curr, th); + v |= find_bad_fds(&readfds, &th->readfds, th->fd); + v |= find_bad_fds(&writefds, &th->writefds, th->fd); + v |= find_bad_fds(&exceptfds, &th->exceptfds, th->fd); + if (v) { + th->select_value = n; + n = max; + } + } + } + END_FOREACH_FROM(curr, th); + } } if (select_timeout && n == 0) { if (now < 0.0) now = timeofday(); @@ -11500,6 +11549,10 @@ if (read) *read = curr_thread->readfds; if (write) *write = curr_thread->writefds; if (except) *except = curr_thread->exceptfds; + if (curr_thread->select_value < 0) { + errno = -curr_thread->select_value; + return -1; + } return curr_thread->select_value; } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/