diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/thread/thread.c | 2 | ||||
| -rw-r--r-- | test/thread/test_queue.rb | 23 |
3 files changed, 32 insertions, 1 deletions
@@ -1,3 +1,11 @@ +Mon Jan 13 12:03:00 2014 Charlie Somerville <charliesome@ruby-lang.org> + + * ext/thread/thread.c (rb_szqueue_push): check GET_SZQUEUE_WAITERS + instead of GET_QUEUE_WAITERS to prevent deadlock. Patch by Eric Wong. + [Bug #9302] [ruby-core:59324] + + * test/thread/test_queue.rb: add test + Sun Jan 12 16:41:10 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * iseq.c (iseq_load): keep type_map to get rid of memory leak. diff --git a/ext/thread/thread.c b/ext/thread/thread.c index b8be5d883f..208d1172df 100644 --- a/ext/thread/thread.c +++ b/ext/thread/thread.c @@ -459,7 +459,7 @@ static VALUE rb_szqueue_push(VALUE self, VALUE obj) { struct waiting_delete args; - args.waiting = GET_QUEUE_WAITERS(self); + args.waiting = GET_SZQUEUE_WAITERS(self); args.th = rb_thread_current(); while (queue_length(self) >= GET_SZQUEUE_ULONGMAX(self)) { diff --git a/test/thread/test_queue.rb b/test/thread/test_queue.rb index 563b91e748..438e1e75e3 100644 --- a/test/thread/test_queue.rb +++ b/test/thread/test_queue.rb @@ -134,6 +134,29 @@ class TestQueue < Test::Unit::TestCase assert_same q, retval end + def test_sized_queue_throttle + q = SizedQueue.new(1) + i = 0 + consumer = Thread.new do + while q.pop + i += 1 + Thread.pass + end + end + nprod = 4 + npush = 100 + + producer = nprod.times.map do + Thread.new do + npush.times { q.push(true) } + end + end + producer.each(&:join) + q.push(nil) + consumer.join + assert_equal(nprod * npush, i) + end + def test_queue_thread_raise q = Queue.new th1 = Thread.new do |