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

thread.c: report then abort

Browse source 
* thread.c (thread_start_func_2): report then abort on exception,
  if both are set.  [ruby-core:79280] [Bug #13163]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59963 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-09-19 02:42:08 +00:00
parent d61b1e9eaa
commit ab81cc4d80
2 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
test/ruby/test_thread.rb
View file

@ -366,7 +366,8 @@ class TestThread < Test::Unit::TestCase
end
def test_report_on_exception
assert_separately([], <<~"end;") #do
assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
begin;
q1 = Thread::Queue.new
q2 = Thread::Queue.new
@ -418,6 +419,19 @@ class TestThread < Test::Unit::TestCase
assert_equal(true, q1.pop)
Thread.pass while th.alive?
}
assert_warn(/report 5/, "should defaults to the global flag at the start") {
th = Thread.start {
Thread.current.report_on_exception = true
Thread.current.abort_on_exception = true
q2.pop
raise "report 5"
}
assert_raise_with_message(RuntimeError, "report 5") {
q2.push(true)
Thread.pass while th.alive?
}
}
end;
end

25
thread.c
View file

@ -637,19 +637,20 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s
else if (rb_obj_is_kind_of(errinfo, rb_eSystemExit)) {
/* exit on main_thread. */
}
else if (th->vm->thread_abort_on_exception ||
th->abort_on_exception || RTEST(ruby_debug)) {
/* exit on main_thread */
}
else if (th->report_on_exception) {
VALUE mesg = rb_thread_to_s(th->self);
rb_str_cat_cstr(mesg, " terminated with exception:\n");
rb_write_error_str(mesg);
rb_threadptr_error_print(th, errinfo);
errinfo = Qnil;
}
else {
errinfo = Qnil;
if (th->report_on_exception) {
VALUE mesg = rb_thread_to_s(th->self);
rb_str_cat_cstr(mesg, " terminated with exception:\n");
rb_write_error_str(mesg);
rb_threadptr_error_print(th, errinfo);
}
if (th->vm->thread_abort_on_exception ||
th->abort_on_exception || RTEST(ruby_debug)) {
/* exit on main_thread */
}
else {
errinfo = Qnil;
}
}
th->value = Qnil;
}