diff options
author | wyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-20 17:22:00 +0000 |
---|---|---|
committer | wyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-20 17:22:00 +0000 |
commit | 811aaf6c050f32d7a84661da7aae7468d2e8a3e4 (patch) | |
tree | 5508d4406dffbb8f235da1f35d778ef4625b1bee | |
parent | d5d105db79ee5183af27211b952dce1a04c7b8ef (diff) |
Backport #1001; handle EBADF in select() to avoid Interpreter-wide deadlock when native close() is called on fd which is currently being IO#select()ed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@24600 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | eval.c | 83 | ||||
-rw-r--r-- | version.h | 8 |
3 files changed, 77 insertions, 20 deletions
@@ -1,6 +1,10 @@ +Thu Augh 20 9:43:00 2009 Kirk Haines <khaines@ruby-lang.org> + + * Backport #1001; Handle EBADF to fix problem with interpreter wide deadlock when native close() is called on fd which is currently being IO#select()ed. + Wed Aug 19 1:49:00 2009 Kirk Haines <khaines@ruby-lang.org> - * Backport #1232; Writes one extra byte to the buffer in order to prevent overrun. + * Backport #1232; Writes one extra byte to the buffer in order to prevent overrun. r24583 Tue Aug 4 8:53:00 2009 Kirk Haines <khaines@ruby-lang.org> @@ -74,7 +74,16 @@ char *strrchr _((const char*,const char)); #include <time.h> -#ifdef __BEOS__ +#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 @@ -10801,20 +10810,60 @@ rb_thread_schedule() #ifdef ERESTART if (e == ERESTART) goto again; #endif - 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); + 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); + } } if (select_timeout && n == 0) { if (now < 0.0) now = timeofday(); @@ -11125,6 +11174,10 @@ rb_thread_select(max, read, write, except, timeout) 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; } @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2009-08-19" +#define RUBY_RELEASE_DATE "2009-08-20" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20090819 -#define RUBY_PATCHLEVEL 384 +#define RUBY_RELEASE_CODE 20090820 +#define RUBY_PATCHLEVEL 386 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 8 -#define RUBY_RELEASE_DAY 19 +#define RUBY_RELEASE_DAY 20 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |