mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
process.c (waitpid_wait): do not set ECHILD prematurely
It is possible to have both MJIT and normal child processes alive, so we cannot set ECHILD based on such a guess. We can still elide waitpid(PID <= 0) calls if we have callers in vm->waiting_pids, however. For specs, ensure Process.waitall does not leak MJIT PIDs to Rubyspace. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63764 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
6b534134a7
commit
92f5653f45
4 changed files with 20 additions and 8 deletions
|
@ -4,11 +4,19 @@ describe "Process.wait2" do
|
|||
before :all do
|
||||
# HACK: this kludge is temporarily necessary because some
|
||||
# misbehaving spec somewhere else does not clear processes
|
||||
# Note: background processes are unavoidable with MJIT,
|
||||
# but we shouldn't reap them from Ruby-space
|
||||
begin
|
||||
Process.wait(-1, Process::WNOHANG)
|
||||
$stderr.puts "Leaked process before wait2 specs! Waiting for it"
|
||||
without_feature :mjit do
|
||||
$stderr.puts "Leaked process before wait2 specs! Waiting for it"
|
||||
end
|
||||
leaked = Process.waitall
|
||||
$stderr.puts "leaked before wait2 specs: #{leaked}"
|
||||
$stderr.puts "leaked before wait2 specs: #{leaked}" unless leaked.empty?
|
||||
with_feature :mjit do
|
||||
# Ruby-space should not see PIDs used by mjit
|
||||
leaked.should be_empty
|
||||
end
|
||||
rescue Errno::ECHILD # No child processes
|
||||
rescue NotImplementedError
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue