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

merge revision(s) 33130:

Browse source 
* ext/-test-/old_thread_select/old_thread_select.c (old_thread_select):
	  typo.

	* test/-ext-/old_thread_select/test_old_thread_select.rb
	  (TestOldThreadSelect#test_old_select_signal_safe): use SIGINT instead
	  of SIGUSR1 because the former is general and the latter is platform
	  dependent.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33135 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kosaki 2011-08-30 20:28:10 +00:00
parent b1ab5d1b42
commit c8473b46ae
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Wed Aug 31 05:27:59 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/-test-/old_thread_select/old_thread_select.c (old_thread_select):
typo.
* test/-ext-/old_thread_select/test_old_thread_select.rb
(TestOldThreadSelect#test_old_select_signal_safe): use SIGINT instead
of SIGUSR1 because the former is general and the latter is platform
dependent.
Wed Aug 31 05:26:30 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c, include/ruby/intern.h (rb_w32_fd_copy): implement

2
ext/-test-/old_thread_select/old_thread_select.c
View file

@ -41,7 +41,7 @@ old_thread_select(VALUE klass, VALUE r, VALUE w, VALUE e, VALUE timeout)
}
rp = array2fdset(&rfds, r, &max);
wp = array2fdset(&wfds, w, &max);
ep = array2fdset(&efds, w, &max);
ep = array2fdset(&efds, e, &max);
rc = rb_thread_select(max, rp, wp, ep, tvp);
if (rc == -1)
rb_sys_fail("rb_wait_for_single_fd");

10
test/-ext-/old_thread_select/test_old_thread_select.rb
View file

@ -41,12 +41,12 @@ class TestOldThreadSelect < Test::Unit::TestCase
def test_old_select_signal_safe
return unless Process.respond_to?(:kill)
usr1 = false
trap(:USR1) { usr1 = true }
received = false
trap(:INT) { received = true }
main = Thread.current
thr = Thread.new do
Thread.pass until main.stop?
Process.kill(:USR1, $$)
Process.kill(:INT, $$)
true
end
@ -62,8 +62,8 @@ class TestOldThreadSelect < Test::Unit::TestCase
assert diff >= 1.0, "interrupted or short wait"
assert_equal 0, rc
assert_equal true, thr.value
assert usr1, "USR1 not received"
assert received, "SIGINT not received"
ensure
trap(:USR1, "DEFAULT")
trap(:INT, "DEFAULT")
end
end