From 7fa70202bc0668149cc02202dafd0450b4fd2731 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 22 Feb 2009 12:49:53 +0000 Subject: merges r22389 from trunk into ruby_1_9_1. * thread.c (thread_start_func_2): do not delete main thread from living_threads. [ruby-core:19385], [ruby-core:22158] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22537 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ thread.c | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec5afde151..706e74d566 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Feb 18 10:29:12 2009 Nobuyoshi Nakada + + * thread.c (thread_start_func_2): do not delete main thread from + living_threads. [ruby-core:19385], [ruby-core:22158] + Tue Feb 17 05:41:08 2009 Koichi Sasada * compile.c: fix to add "ensure" codes across "while" clause diff --git a/thread.c b/thread.c index 482f5f331c..52ba351256 100644 --- a/thread.c +++ b/thread.c @@ -440,8 +440,10 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s th->keeping_mutexes = NULL; } - /* delete self from living_threads */ - st_delete_wrap(th->vm->living_threads, th->self); + /* delete self other than main thread from living_threads */ + if (th != main_th) { + st_delete_wrap(th->vm->living_threads, th->self); + } /* wake up joinning threads */ join_th = th->join_list_head; @@ -1026,7 +1028,7 @@ rb_thread_blocking_region_end(struct rb_blocking_region_buffer *region) * * Safe C API: * * rb_thread_interrupted() - check interrupt flag - * * ruby_xalloc(), ruby_xrealloc(), ruby_xfree() - + * * ruby_xalloc(), ruby_xrealloc(), ruby_xfree() - * if they called without GVL, acquire GVL automatically. */ VALUE @@ -2132,7 +2134,7 @@ rb_thread_priority_set(VALUE thread, VALUE prio) * - OpenBSD 2.0 (src/sys/kern/sys_generic.c:1.4) * select(2) documents how to allocate fd_set dynamically. * http://www.openbsd.org/cgi-bin/man.cgi?query=select&manpath=OpenBSD+4.4 - * - HP-UX documents how to allocate fd_set dynamically. + * - HP-UX documents how to allocate fd_set dynamically. * http://docs.hp.com/en/B2355-60105/select.2.html * - Solaris 8 has select_large_fdset * @@ -2718,7 +2720,7 @@ thgroup_list(VALUE group) { VALUE ary = rb_ary_new(); struct thgroup_list_params param; - + param.ary = ary; param.group = group; st_foreach(GET_THREAD()->vm->living_threads, thgroup_list_i, (st_data_t) & param); @@ -3638,7 +3640,7 @@ static void call_trace_func(rb_event_flag_t event, VALUE proc, VALUE self, ID id, VALUE klass) { struct call_trace_func_args args; - + args.event = event; args.proc = proc; args.self = self; -- cgit v1.2.3