1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* thread.c (rb_thread_select): fix a typo to initialize efds

Browse Source 
properly.  [Bug #5299] [ruby-core:39380]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33231 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-09-09 01:22:06 +00:00
parent fa5446f14e
commit 61b062ba6d
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Sep 9 10:22:03 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread.c (rb_thread_select): fix a typo to initialize efds
properly. [Bug #5299] [ruby-core:39380]
Fri Sep 9 02:02:09 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
* template/yarvarch.ja:

15
test/-ext-/old_thread_select/test_old_thread_select.rb
View File

@ -23,6 +23,17 @@ class TestOldThreadSelect < Test::Unit::TestCase
end
end
def test_old_select_error_timeout
bug5299 = '[ruby-core:39380]'
with_pipe do |r, w|
t0 = Time.now
rc = IO.old_thread_select(nil, nil, [r.fileno], 0.001)
diff = Time.now - t0
assert_equal 0, rc, bug5299
assert_operator diff, :>=, 0.001, "returned too early"
end
end
def test_old_select_read_write_check
with_pipe do |r, w|
w.syswrite('.')
@ -63,7 +74,7 @@ class TestOldThreadSelect < Test::Unit::TestCase
assert_equal 0, rc
assert_equal true, thr.value
assert_not_equal false, received, "SIGINT not received"
ensure
trap(:INT, "DEFAULT")
ensure
trap(:INT, "DEFAULT")
end
end

2
thread.c
View File

@ -2704,7 +2704,7 @@ rb_thread_select(int max, fd_set * read, fd_set * write, fd_set * except,
}
if (except) {
efds = &fdsets[2];
rb_fd_init(wfds);
rb_fd_init(efds);
rb_fd_copy(efds, except, max);
}