summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-20 06:07:05 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-20 06:07:05 +0000
commit661955cc39db3a96f9adc731e3df7c2fef9882ef (patch)
tree82bb1f03c02d7ec9d83e7648e5829388576c2429 /thread.c
parenta29c96840dcadfbbf953f765b1909c9ca84098ed (diff)
* thread.c (do_select, rb_thread_wait_fd_rw): raise sys error if
errno is not 0 and EBADF. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11795 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/thread.c b/thread.c
index e9dc5386b4..d206e58afc 100644
--- a/thread.c
+++ b/thread.c
@@ -1716,9 +1716,6 @@ do_select(int n, fd_set *read, fd_set *write, fd_set *except,
#endif
goto retry;
}
- else {
- rb_bug("fatal error on select() - errno: %d\n", lerrno);
- }
}
return result;
}
@@ -1740,6 +1737,10 @@ rb_thread_wait_fd_rw(int fd, int read)
else {
result = do_select(fd + 1, 0, rb_fd_ptr(&set), 0, 0);
}
+
+ if (result < 0 && errno != EBADF) {
+ rb_sys_fail(0);
+ }
}
thread_debug("rb_thread_wait_fd_rw(%d, %s): done\n", fd, read ? "read" : "write");
@@ -1773,7 +1774,7 @@ rb_thread_select(int max, fd_set * read, fd_set * write, fd_set * except,
else {
return do_select(max, read, write, except, timeout);
}
- }
+}
/*