diff options
| -rw-r--r-- | test/thread/test_queue.rb | 17 | ||||
| -rw-r--r-- | thread_sync.c | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/test/thread/test_queue.rb b/test/thread/test_queue.rb index e1821da0de..6122d9b87c 100644 --- a/test/thread/test_queue.rb +++ b/test/thread/test_queue.rb @@ -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 diff --git a/thread_sync.c b/thread_sync.c index ce280cea1a..152995fac0 100644 --- a/thread_sync.c +++ b/thread_sync.c @@ -773,7 +773,7 @@ queue_delete_from_waiting(struct waiting_delete *p) static VALUE queue_sleep(VALUE arg) { - rb_thread_sleep_deadly(); + rb_thread_sleep_deadly_allow_spurious_wakeup(); return Qnil; } |