archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 08:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* backport r33117 from trunk.

Browse source 
* thread.c (rb_thread_select): rewrite by using
  rb_thread_fd_select(). old one is EINTR unsafe.
  Patch by Eric Wong. [Bug #5229] [ruby-core:39102]

* test/-ext-/old_thread_select/test_old_thread_select.rb:
  a testcase for rb_thread_select().
* ext/-test-/old_thread_select/old_thread_select.c: ditto.
* ext/-test-/old_thread_select/depend: ditto.
* ext/-test-/old_thread_select/extconf.rb: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33119 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kosaki 2011-08-30 00:53:44 +00:00
parent f1c8cdd12b
commit 4e9438bc91
6 changed files with 169 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

47
thread.c
View file

@ -2682,30 +2682,37 @@ int
rb_thread_select(int max, fd_set * read, fd_set * write, fd_set * except,
struct timeval *timeout)
{
if (!read && !write && !except) {
if (!timeout) {
rb_thread_sleep_forever();
return 0;
}
rb_thread_wait_for(*timeout);
return 0;
}
else {
int lerrno = errno;
int result;
rb_fdset_t fdsets[3] = { 0 };
rb_fdset_t *rfds = NULL;
rb_fdset_t *wfds = NULL;
rb_fdset_t *efds = NULL;
int retval;
BLOCKING_REGION({
result = select(max, read, write, except, timeout);
if (result < 0)
lerrno = errno;
}, ubf_select, GET_THREAD());
errno = lerrno;
return result;
if (read) {
rfds = &fdsets[0];
rb_fd_copy(rfds, read, max);
}
if (write) {
wfds = &fdsets[1];
rb_fd_copy(wfds, write, max);
}
if (except) {
efds = &fdsets[2];
rb_fd_copy(efds, except, max);
}
retval = rb_thread_fd_select(max, rfds, efds, wfds, timeout);
if (rfds)
rb_fd_term(rfds);
if (wfds)
rb_fd_term(wfds);
if (efds)
rb_fd_term(efds);
return retval;
}
int
rb_thread_fd_select(int max, rb_fdset_t * read, rb_fdset_t * write, rb_fdset_t * except,
struct timeval *timeout)