diff options
| -rw-r--r-- | cont.c | 20 | ||||
| -rw-r--r-- | vm.c | 13 |
2 files changed, 23 insertions, 10 deletions
@@ -440,6 +440,7 @@ fiber_free(void *ptr) { rb_fiber_t *fib = ptr; RUBY_FREE_ENTER("fiber"); + if (fib->cont.saved_ec.local_storage) { st_free_table(fib->cont.saved_ec.local_storage); } @@ -1476,7 +1477,6 @@ rb_threadptr_root_fiber_setup(rb_thread_t *th) fib->cont.thread_ptr = th; fiber_status_set(fib, FIBER_RESUMED); /* skip CREATED */ th->ec = &fib->cont.saved_ec; - th->root_fiber = th->ec->fiber = fib; #if FIBER_USE_NATIVE #ifdef _WIN32 if (fib->fib_handle == 0) { @@ -1486,6 +1486,24 @@ rb_threadptr_root_fiber_setup(rb_thread_t *th) #endif } +void +rb_threadptr_root_fiber_release(rb_thread_t *th) +{ + if (th->root_fiber) { + /* ignore. A root fiber object will free th->ec */ + } + else { + VM_ASSERT(th->ec->fiber->cont.type == ROOT_FIBER_CONTEXT); + VM_ASSERT(th->ec->fiber->cont.self == 0); + fiber_free(th->ec->fiber); + + if (th->ec == ruby_current_execution_context_ptr) { + ruby_current_execution_context_ptr = NULL; + } + th->ec = NULL; + } +} + static inline rb_fiber_t* fiber_current(void) { @@ -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) { |