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 (thread_start_func_2): let abort_on_exception work.

Browse source 
[ruby-core:11873]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12913 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-08-09 20:12:21 +00:00
parent d3a1980b96
commit 2903ea4aeb
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Aug 10 05:12:19 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread.c (thread_start_func_2): let abort_on_exception work.
[ruby-core:11873]
Fri Aug 10 04:47:09 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Aug 10 04:47:09 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (internal_id_gen): internal ID must be bigger than * parse.y (internal_id_gen): internal ID must be bigger than

17
thread.c
View file

@ -277,6 +277,9 @@ thread_cleanup_func(void *th_ptr)
native_thread_destroy(th); native_thread_destroy(th);
} }
extern void ruby_error_print(void);
static VALUE rb_thread_raise(int, VALUE *, rb_thread_t *);
static int static int
thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_start) thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_start)
{ {
@ -284,6 +287,8 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s
VALUE args = th->first_args; VALUE args = th->first_args;
rb_proc_t *proc; rb_proc_t *proc;
rb_thread_t *join_th; rb_thread_t *join_th;
VALUE errinfo = Qnil;
th->machine_stack_start = stack_start; th->machine_stack_start = stack_start;
#ifdef __ia64 #ifdef __ia64
th->machine_register_stack_start = register_stack_start; th->machine_register_stack_start = register_stack_start;
@ -313,6 +318,12 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s
}); });
} }
else { else {
if (th->safe_level < 4 &&
(th->vm->thread_abort_on_exception ||
th->abort_on_exception || RTEST(ruby_debug))) {
errinfo = th->errinfo;
if (NIL_P(errinfo)) errinfo = rb_errinfo();
}
th->value = Qnil; th->value = Qnil;
} }
TH_POP_TAG(); TH_POP_TAG();
@ -331,6 +342,12 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s
} }
thread_cleanup_func(th); thread_cleanup_func(th);
native_mutex_unlock(&th->vm->global_interpreter_lock); native_mutex_unlock(&th->vm->global_interpreter_lock);
if (!NIL_P(errinfo) && th != th->vm->main_thread) {
/* exit on main_thread */
rb_thread_raise(1, &errinfo, th->vm->main_thread);
}
return 0; return 0;
} }