summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-12 11:41:30 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-12 11:41:30 +0000
commit167f6b291f4cf697048af42820c82d8cf357e0a7 (patch)
tree750e7c085bad1a44d7856f5d650ae3a5c7a75f61 /thread.c
parente0eaa117d2bae9968258ec0e14bab667998abe66 (diff)
merge revision(s) 33256:
* thread.c (rb_thread_select): fix to ignore an argument modification of rb_thread_fd_select(). based on a patch by Eric Wong. [Bug #5306] [ruby-core:39435] * thread.c (rb_fd_rcopy): New. for reverse fd copy. * test/-ext-/old_thread_select/test_old_thread_select.rb (test_old_select_false_positive): test for bug5306. * ext/-test-/old_thread_select/old_thread_select.c (fdset2array): New. convert fdsets to array. * ext/-test-/old_thread_select/old_thread_select.c (old_thread_select): return 'read', 'write', 'except' argument of rb_thread_select() to ruby script. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c38
1 files changed, 35 insertions, 3 deletions
diff --git a/thread.c b/thread.c
index 28eece555d..192b696629 100644
--- a/thread.c
+++ b/thread.c
@@ -2391,6 +2391,17 @@ 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)
{
@@ -2449,6 +2460,19 @@ 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);
+
+ if (max > FD_SETSIZE) {
+ 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)
{
@@ -2485,6 +2509,8 @@ 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
#if defined(__CYGWIN__)
@@ -2706,12 +2732,18 @@ rb_thread_select(int max, fd_set * read, fd_set * write, fd_set * except,
retval = rb_thread_fd_select(max, rfds, wfds, efds, timeout);
- if (rfds)
+ if (rfds) {
+ rb_fd_rcopy(read, rfds);
rb_fd_term(rfds);
- if (wfds)
+ }
+ if (wfds) {
+ rb_fd_rcopy(write, wfds);
rb_fd_term(wfds);
- if (efds)
+ }
+ if (efds) {
+ rb_fd_rcopy(except, efds);
rb_fd_term(efds);
+ }
return retval;
}