mirror of
https://github.com/ruby/ruby.git
synced 2025-09-17 01:23:57 +02:00
merge revision(s) 57477,57478,57479: [Backport #12405]
use TRUE/FALSE. define rb_thread_sleep_deadly_allow_spurious_wakeup(). * thread.c, thread_sync.c: define new function rb_thread_sleep_deadly_allow_spurious_wakeup() and use it instead of using sleep_forever() directly. allow Queue operation in trap. * thread_sync.c: allow spurious wakeup to check Queue status just after trap. [Bug #12405] * test/thread/test_queue.rb: add a test for it. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57879 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
9258462e2a
commit
0c72a8f091
4 changed files with 31 additions and 6 deletions
|
@ -547,4 +547,21 @@ class TestQueue < Test::Unit::TestCase
|
|||
# don't leak this thread
|
||||
assert_nothing_raised{counter.join}
|
||||
end
|
||||
|
||||
def test_queue_with_trap
|
||||
assert_in_out_err([], <<-INPUT, %w(USR2 USR2 exit), [])
|
||||
q = Queue.new
|
||||
trap(:USR2){
|
||||
q.push 'USR2'
|
||||
}
|
||||
Thread.new{
|
||||
loop{
|
||||
Process.kill :USR2, $$
|
||||
}
|
||||
}
|
||||
puts q.pop
|
||||
puts q.pop
|
||||
puts 'exit'
|
||||
INPUT
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue