1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix freeing th->ec bugs.

Browse Source 
* 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
This commit is contained in:
ko1 2017-10-26 14:21:31 +00:00
parent 4552f74715
commit 8afee516be
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cont.c
View File

@ -440,6 +440,7 @@ fiber_free(void *ptr)
{ {
rb_fiber_t *fib = ptr; rb_fiber_t *fib = ptr;
RUBY_FREE_ENTER("fiber"); RUBY_FREE_ENTER("fiber");
if (fib->cont.saved_ec.local_storage) { if (fib->cont.saved_ec.local_storage) {
st_free_table(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; fib->cont.thread_ptr = th;
fiber_status_set(fib, FIBER_RESUMED); /* skip CREATED */ fiber_status_set(fib, FIBER_RESUMED); /* skip CREATED */
th->ec = &fib->cont.saved_ec; th->ec = &fib->cont.saved_ec;
th->root_fiber = th->ec->fiber = fib;
#if FIBER_USE_NATIVE #if FIBER_USE_NATIVE
#ifdef _WIN32 #ifdef _WIN32
if (fib->fib_handle == 0) { if (fib->fib_handle == 0) {
@ -1486,6 +1486,24 @@ rb_threadptr_root_fiber_setup(rb_thread_t *th)
#endif #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* static inline rb_fiber_t*
fiber_current(void) fiber_current(void)
{ {

13
vm.c
View File

@ -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_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 void
rb_thread_mark(void *ptr) 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->pending_interrupt_mask_stack);
RUBY_MARK_UNLESS_NULL(th->top_self); RUBY_MARK_UNLESS_NULL(th->top_self);
RUBY_MARK_UNLESS_NULL(th->top_wrapper); 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->stat_insn_usage);
RUBY_MARK_UNLESS_NULL(th->last_status); RUBY_MARK_UNLESS_NULL(th->last_status);
RUBY_MARK_UNLESS_NULL(th->locking_mutex); 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); rb_bug("thread_free: keeping_mutexes must be NULL (%p:%p)", (void *)th, (void *)th->keeping_mutexes);
} }
if (th->ec->local_storage) { rb_threadptr_root_fiber_release(th);
st_free_table(th->ec->local_storage);
}
if (th->ec == ruby_current_execution_context_ptr)
ruby_current_execution_context_ptr = NULL;
if (th->vm && th->vm->main_thread == th) { if (th->vm && th->vm->main_thread == th) {
RUBY_GC_INFO("main thread\n"); RUBY_GC_INFO("main thread\n");
@ -2525,8 +2522,6 @@ thread_alloc(VALUE klass)
return obj; return obj;
} }
void rb_threadptr_root_fiber_setup(rb_thread_t *th);
static void static void
th_init(rb_thread_t *th, VALUE self) th_init(rb_thread_t *th, VALUE self)
{ {