summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-01-31 07:00:38 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-01-31 07:00:38 +0000
commitbfdfc99cc2ea49f15b1380516bd341f4e7b425b6 (patch)
tree744d11534cfc0b523b9f2b6b0de76918a5523922
parent6897b3b9854eb54afd6898830e9935ce68a276de (diff)
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/trunk@57479 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/thread/test_queue.rb17
-rw-r--r--thread_sync.c2
2 files changed, 18 insertions, 1 deletions
diff --git a/test/thread/test_queue.rb b/test/thread/test_queue.rb
index e1821da0de7..6122d9b87c0 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 ce280cea1a8..152995fac06 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;
}