summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-27 14:08:56 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-27 14:08:56 +0000
commit95abe79e04c3238ea2dde68ea1ab567e354aad21 (patch)
treeeab1b9438935992bdd33675534c0372a0c6feff0 /test
parent1bbf778962743171693a9a279914bf9dae431405 (diff)
merge revision(s) 64007,64019,64020: [Backport #14929]
thread.c (do_select): fix leak on exception When do_select is interrupted and raise happens from RUBY_VM_CHECK_INTS_BLOCKING, the original FD sets we copied do not get freed, leading to a memory leak. Wrap up all the FD sets into a Ruby object to ensure the GC can release an allocations made for rb_fdset_t. This leak existed since Ruby 2.0.0 (r36430) [Bug #14929] increase timeout seconds. * test/ruby/test_io.rb (test_select_leak): increase timeout seconds to pass this test on a high-load machine. 60 sec is not enough at all git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@64561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_io.rb16
1 files changed, 16 insertions, 0 deletions
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 034dac570c..dc99a8c463 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -3549,4 +3549,20 @@ __END__
end
end
end
+
+ def test_select_leak
+ assert_no_memory_leak([], <<-"end;", <<-"end;", rss: true, timeout: 60)
+ r, w = IO.pipe
+ rset = [r]
+ wset = [w]
+ Thread.new { IO.select(rset, wset, nil, 0) }.join
+ end;
+ 20_000.times do
+ th = Thread.new { IO.select(rset, wset) }
+ Thread.pass until th.stop?
+ th.kill
+ th.join
+ end
+ end;
+ end
end