kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* eval.c (rb_thread_schedule): handle EBADF of select as well.

Browse source 
[ruby-core:21264]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@22299 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-02-14 09:58:46 +00:00
parent 4b2d8912b9
commit e509fb2c48
2 changed files with 71 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Feb 14 18:57:10 2009 Tanaka Akira <akr@fsij.org>
* eval.c (rb_thread_schedule): handle EBADF of select as well.
[ruby-core:21264]
Mon Feb 9 12:02:29 2009 Akinori MUSHA <knu@iDaemons.org>
* lib/open-uri.rb: add :read_timeout option.

79
eval.c
View file

@ -74,6 +74,15 @@ char *strrchr _((const char*,const char));
#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 @@ 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;
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 @@ 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;
}