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 (rb_thread_terminate_all): fix to ignore

Browse source 
exceptions.
* thread.c (thread_start_func_2): fix
  abort_on_exception process.  [ruby-dev:31394]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13078 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2007-08-17 07:24:03 +00:00
parent 82a9ca296b
commit e5d5f5a61a
2 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Fri Aug 17 16:02:50 2007 Koichi Sasada <ko1@atdot.net>
* thread.c (rb_thread_terminate_all): fix to ignore
exceptions.
* thread.c (thread_start_func_2): fix
abort_on_exception process. [ruby-dev:31394]
Fri Aug 17 14:38:36 2007 Tanaka Akira <akr@fsij.org> Fri Aug 17 14:38:36 2007 Tanaka Akira <akr@fsij.org>
* bootstraptest/runner.rb (in_temporary_working_directory): use * bootstraptest/runner.rb (in_temporary_working_directory): use

24
thread.c
View file

@ -259,8 +259,15 @@ rb_thread_terminate_all(void)
st_foreach(vm->living_threads, terminate_i, (st_data_t)th); st_foreach(vm->living_threads, terminate_i, (st_data_t)th);
while (!rb_thread_alone()) { while (!rb_thread_alone()) {
PUSH_TAG();
if (EXEC_TAG() == 0) {
rb_thread_schedule(); rb_thread_schedule();
} }
else {
/* ignore exception */
}
POP_TAG();
}
system_working = 0; system_working = 0;
} }
@ -327,14 +334,20 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s
} }
th->value = Qnil; th->value = Qnil;
} }
TH_POP_TAG();
th->status = THREAD_KILLED; th->status = THREAD_KILLED;
thread_debug("thread end: %p\n", th); thread_debug("thread end: %p\n", th);
st_delete_wrap(th->vm->living_threads, th->self);
main_th = th->vm->main_thread; main_th = th->vm->main_thread;
if (th == main_th) errinfo = Qnil; if (th != main_th) {
if (TYPE(errinfo) == T_OBJECT) {
/* treat with normal error object */
rb_thread_raise(1, &errinfo, main_th);
}
}
TH_POP_TAG();
st_delete_wrap(th->vm->living_threads, th->self);
/* wake up joinning threads */ /* wake up joinning threads */
join_th = th->join_list_head; join_th = th->join_list_head;
@ -348,11 +361,6 @@ 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)) {
/* exit on main_thread */
rb_thread_raise(1, &errinfo, main_th);
}
return 0; return 0;
} }