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

vm_trace.c: defer interrupts while postponed jobs

Browse source 
* vm_trace.c (rb_postponed_job_flush): mask signal trap interrupt
  too to defer handling after finalizers finished.
  [ruby-core:66825] [Bug #10595]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48829 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-12-13 11:41:57 +00:00
parent 6447d061f5
commit 05459d1a33
3 changed files with 36 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sat Dec 13 20:41:55 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_trace.c (rb_postponed_job_flush): mask signal trap interrupt
too to defer handling after finalizers finished.
[ruby-core:66825] [Bug #10595]
Sat Dec 13 18:33:25 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> Sat Dec 13 18:33:25 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* test/openssl/test_pkey_ec.rb: ignored tests with old OpenSSL. * test/openssl/test_pkey_ec.rb: ignored tests with old OpenSSL.

26
test/ruby/test_gc.rb
View file

@ -331,6 +331,32 @@ class TestGc < Test::Unit::TestCase
end; end;
end end
def test_interrupt_in_finalizer
bug10595 = '[ruby-core:66825] [Bug #10595]'
src = <<-'end;'
f = proc {1000.times {}}
loop do
ObjectSpace.define_finalizer(Object.new, f)
end
end;
error = nil
status = nil
EnvUtil.invoke_ruby(["-e", src], "", false, true) do |_, _, stderr, pid|
sleep 0.1
Process.kill("INT", pid)
th = Thread.start do
sleep 1
Process.kill("KILL", pid) rescue nil
end
error = stderr.read
_, status = Process.wait2(pid)
th.kill
end
assert_predicate status, :signaled?
assert_equal "INT", Signal.signame(status.termsig), bug10595
assert_match /Interrupt/, error, bug10595
end
def test_verify_internal_consistency def test_verify_internal_consistency
assert_nil(GC.verify_internal_consistency) assert_nil(GC.verify_internal_consistency)
end end

7
vm_trace.c
View file

@ -1554,12 +1554,13 @@ void
rb_postponed_job_flush(rb_vm_t *vm) rb_postponed_job_flush(rb_vm_t *vm)
{ {
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();
unsigned long saved_postponed_job_interrupt_mask = th->interrupt_mask & POSTPONED_JOB_INTERRUPT_MASK; const unsigned long block_mask = POSTPONED_JOB_INTERRUPT_MASK|TRAP_INTERRUPT_MASK;
unsigned long saved_mask = th->interrupt_mask & block_mask;
VALUE saved_errno = th->errinfo; VALUE saved_errno = th->errinfo;
th->errinfo = Qnil; th->errinfo = Qnil;
/* mask POSTPONED_JOB dispatch */ /* mask POSTPONED_JOB dispatch */
th->interrupt_mask |= POSTPONED_JOB_INTERRUPT_MASK; th->interrupt_mask |= block_mask;
{ {
TH_PUSH_TAG(th); TH_PUSH_TAG(th);
EXEC_TAG(); EXEC_TAG();
@ -1575,6 +1576,6 @@ rb_postponed_job_flush(rb_vm_t *vm)
TH_POP_TAG(); TH_POP_TAG();
} }
/* restore POSTPONED_JOB mask */ /* restore POSTPONED_JOB mask */
th->interrupt_mask &= ~(saved_postponed_job_interrupt_mask ^ POSTPONED_JOB_INTERRUPT_MASK); th->interrupt_mask &= ~(saved_mask ^ block_mask);
th->errinfo = saved_errno; th->errinfo = saved_errno;
} }