From 3d0d4ba75d54c7b2ad5ce2d9024f78d3847a55d4 Mon Sep 17 00:00:00 2001 From: ko1 Date: Thu, 26 Oct 2017 14:21:31 +0000 Subject: fix freeing `th->ec` bugs. * vm.c (thread_free): simply call rb_threadptr_root_fiber_release(). * cont.c (rb_threadptr_root_fiber_release): release th->ec (ec->fiber) iff root_fiber is NULL. If root_fiber is available, then ignore it and root fiber object will free th->ec too. * cont.c (rb_threadptr_root_fiber_setup): do not set th->root_fiber. th->root_fiber will be set if a root fiber object is created. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60451 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'vm.c') diff --git a/vm.c b/vm.c index 5bd7dad246..92cad06206 100644 --- a/vm.c +++ b/vm.c @@ -2415,6 +2415,8 @@ rb_execution_context_mark(const rb_execution_context_t *ec) } void rb_fiber_mark_self(rb_fiber_t *fib); +void rb_threadptr_root_fiber_setup(rb_thread_t *th); +void rb_threadptr_root_fiber_release(rb_thread_t *th); void rb_thread_mark(void *ptr) @@ -2433,7 +2435,7 @@ rb_thread_mark(void *ptr) RUBY_MARK_UNLESS_NULL(th->pending_interrupt_mask_stack); RUBY_MARK_UNLESS_NULL(th->top_self); RUBY_MARK_UNLESS_NULL(th->top_wrapper); - rb_fiber_mark_self(th->root_fiber); + if (th->root_fiber) rb_fiber_mark_self(th->root_fiber); RUBY_MARK_UNLESS_NULL(th->stat_insn_usage); RUBY_MARK_UNLESS_NULL(th->last_status); RUBY_MARK_UNLESS_NULL(th->locking_mutex); @@ -2456,12 +2458,7 @@ thread_free(void *ptr) rb_bug("thread_free: keeping_mutexes must be NULL (%p:%p)", (void *)th, (void *)th->keeping_mutexes); } - if (th->ec->local_storage) { - st_free_table(th->ec->local_storage); - } - - if (th->ec == ruby_current_execution_context_ptr) - ruby_current_execution_context_ptr = NULL; + rb_threadptr_root_fiber_release(th); if (th->vm && th->vm->main_thread == th) { RUBY_GC_INFO("main thread\n"); @@ -2525,8 +2522,6 @@ thread_alloc(VALUE klass) return obj; } -void rb_threadptr_root_fiber_setup(rb_thread_t *th); - static void th_init(rb_thread_t *th, VALUE self) { -- cgit v1.2.3