kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/thread/thread.c (rb_szqueue_push): check GET_SZQUEUE_WAITERS

Browse source 
instead of GET_QUEUE_WAITERS to prevent deadlock. Patch by Eric Wong.
  [Bug #9302] [ruby-core:59324]

* test/thread/test_queue.rb: add test

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
charliesome 2014-01-13 03:18:38 +00:00
parent 23a8568739
commit 64926db998
3 changed files with 32 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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.

2
ext/thread/thread.c
View file

@ -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)) {

23
test/thread/test_queue.rb
View file

@ -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