diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-19 14:19:40 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-19 14:19:40 +0000 |
commit | f4a8db647ae66621f5d37402f5a11a3d57c69bb0 (patch) | |
tree | 2325b2b809b9d94ef2ccc367f5f84d9672e9f00d /test/ruby/test_thread.rb | |
parent | 422e8d5adc3cf2d67b53cf9050c750eba7db3673 (diff) | |
download | ruby-f4a8db647ae66621f5d37402f5a11a3d57c69bb0.tar.gz |
* thread.c (rb_thread_s_control_interrupt,
rb_thread_s_check_interrupt): added for
Thread.control_intgerrupt and Thread.check_interrupt.
See details on rdoc.
I'll make an ticket for this feature.
* test/ruby/test_thread.rb: add a test for Thread.control_intgerrupt.
* thread.c (rb_threadptr_raise): make a new exception object
even if argc is 0.
* thread.c (rb_thread_kill): kill thread immediately if target thread
is current thread.
* vm_core.h (RUBY_VM_CHECK_INTS_BLOCKING): added.
CHECK_INTS while/after blocking operation.
* vm_core.h (RUBY_VM_CHECK_INTS): require rb_thread_t ptr.
* cont.c (fiber_switch): use replaced RUBY_VM_CHECK_INTS().
* eval.c (ruby_cleanup): ditto.
* insns.def: ditto.
* process.c (rb_waitpid): ditto.
* vm_eval.c (vm_call0): ditto.
* vm_insnhelper.c (vm_call_method): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36470 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby/test_thread.rb')
-rw-r--r-- | test/ruby/test_thread.rb | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index 946d522cd9..ed22cf9b44 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -615,6 +615,72 @@ class TestThread < Test::Unit::TestCase end assert_equal("Can't call on top of Fiber or Thread", error.message, bug5083) end + + def make_control_interrupt_test_thread1 flag + r = [] + q = Queue.new + th = Thread.new{ + begin + Thread.control_interrupt(RuntimeError => flag){ + q << :go + begin + sleep 0.5 + rescue + r << :c1 + end + } + sleep 0.5 + rescue + r << :c2 + end + } + q.pop # wait + th.raise + begin + th.join + rescue + r << :c3 + end + r + end + + def test_control_interrupt + [[:never, :c2], + [:immediate, :c1], + [:on_blocking, :c1]].each{|(flag, c)| + assert_equal([flag, c], [flag] + make_control_interrupt_test_thread1(flag)) + } + # TODO: complex cases are needed. + end + + def test_check_interrupt + q = Queue.new + Thread.control_interrupt(RuntimeError => :never){ + th = Thread.new{ + q.push :e + begin + begin + sleep 0.5 + rescue => e + q.push :ng1 + end + begin + Thread.check_interrupt + rescue => e + q.push :ok + end + rescue => e + q.push :ng2 + ensure + q.push :ng3 + end + } + q.pop + th.raise + th.join + assert_equal(:ok, q.pop) + } + end end class TestThreadGroup < Test::Unit::TestCase |