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

test/ruby/test_thread.rb (test_fork_while_parent_locked): rewrite to avoid OOM

Browse source 
Instead of using a torture test, trigger the condition for the old
segfault in [Bug #15383] exactly.

[ruby-core:90676] [Bug #15430]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66508 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2018-12-23 08:42:44 +00:00
parent e5d634260e
commit 37bba27b2c
1 changed files with 14 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
test/ruby/test_thread.rb
View file

@ -1241,44 +1241,23 @@ q.pop
def test_fork_while_parent_locked
skip 'needs fork' unless Process.respond_to?(:fork)
require 'tempfile'
m = Thread::Mutex.new
failures = 0
run = true
errs = ''
nr = 25 # reduce if more SIGKILL in tests
tmps = nr.times.map { Tempfile.new('Bug.15430.diagnosis') }
thrs = nr.times.map do |_i|
Thread.new(_i) do |i|
t = tmps[i]
t.sync = true
while run
pid = fork do
STDERR.reopen(t.path)
tmps.each(&:close)
m.synchronize {}
end
m.synchronize {}
_, st = Process.waitpid2(pid)
unless st.success?
m.synchronize do
failures += 1
if errs.empty?
errs = st.inspect << t.read
t.rewind
end
end
end
end
nr = 1
thrs = []
m.synchronize do
thrs = nr.times.map { Thread.new { m.synchronize {} } }
thrs.each { Thread.pass }
pid = fork do
m.locked? or exit!(2)
thrs = nr.times.map { Thread.new { m.synchronize {} } }
m.unlock
thrs.each { |t| t.join(1) == t or exit!(1) }
exit!(0)
end
_, st = Process.waitpid2(pid)
assert_predicate st, :success?, '[ruby-core:90312] [Bug #15383]'
end
sleep 0.5
run = false
thrs.each(&:join)
assert_empty errs, "lower `nr' if SIGKILL because of RLIMIT_NPROC limit"
assert_equal 0, failures, '[ruby-core:90312] [Bug #15383]'
ensure
tmps&.each(&:close!)
thrs.each { |t| assert_same t, t.join(1) }
end
def test_fork_while_mutex_locked_by_forker