diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-15 08:33:52 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-15 08:33:52 +0000 |
| commit | 072ccff04debff32072e771bc078fe8bc14ccaad (patch) | |
| tree | 8a40c5cffae187dca7a2d507b89b19de037d811d /test/thread/test_thread.rb | |
| parent | faa30cafd475c6f586694910df9767deff97d33e (diff) | |
* eval.c (rb_thread_join), ext/thread/thread.c (wake_one): adjusts
targets of rest waiting threads to join. [ruby-core:23457]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@23432 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/thread/test_thread.rb')
| -rw-r--r-- | test/thread/test_thread.rb | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/test/thread/test_thread.rb b/test/thread/test_thread.rb index f34c2ff848..73b148c92f 100644 --- a/test/thread/test_thread.rb +++ b/test/thread/test_thread.rb @@ -85,5 +85,68 @@ class TC_Thread < Test::Unit::TestCase assert_nothing_raised("[ruby-dev:37545]") {assert_equal(1, queue.pop)} assert(queue.empty?) end + + # This test checks that a thread in Mutex#lock which is raised is + # completely removed from the wait_list of the mutex + def test_mutex_exception_handling + m = Mutex.new + m.lock + + sleeping = false + t = Thread.new do + begin + m.lock + rescue + end + + sleeping = true + # Keep that thread alive: if the thread returns, the test method + # won't be able to check that +m+ has not been taken (dead mutex + # owners are ignored) + sleep + end + + # Wait for t to wait for the mutex and raise it + while true + sleep 0.1 + break if t.stop? + end + t.raise ArgumentError + assert(t.alive? || sleeping) + + # Wait for +t+ to reach the sleep + while true + sleep 0.1 + break if t.stop? + end + + # Now unlock. The mutex should be free, so Mutex#unlock should return nil + assert(! m.unlock) + end + + def test_mutex_join + m = Mutex.new + m.lock + wt2 = Thread.new do + m.lock + sleep 0.5 + m.unlock + end + + # Ensure wt2 is waiting on m + sleep 0.1 + + wt1 = Thread.new do + m.lock + m.unlock + end + # Ensure wt1 is waiting on m + sleep 0.1 + + # Give it to wt2 + m.unlock + + assert_nothing_raised {wt1.join} + end end |