archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Track how stack was allocated for cont_free.

Browse source
This commit is contained in:
Samuel Williams 2019-06-05 23:39:17 +12:00
parent 4b3b781c66
commit b8e4bea780
2 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cont.c
View file

@ -128,6 +128,7 @@ typedef struct rb_context_struct {
#endif #endif
} machine; } machine;
rb_execution_context_t saved_ec; rb_execution_context_t saved_ec;
int free_vm_stack;
rb_jmpbuf_t jmpbuf; rb_jmpbuf_t jmpbuf;
rb_ensure_entry_t *ensure_array; rb_ensure_entry_t *ensure_array;
/* Pointer to MJIT info about the continuation. */ /* Pointer to MJIT info about the continuation. */
@ -407,7 +408,10 @@ cont_free(void *ptr)
rb_context_t *cont = ptr; rb_context_t *cont = ptr;
RUBY_FREE_ENTER("cont"); RUBY_FREE_ENTER("cont");
if (cont->free_vm_stack) {
ruby_xfree(cont->saved_ec.vm_stack); ruby_xfree(cont->saved_ec.vm_stack);
}
#if FIBER_USE_NATIVE #if FIBER_USE_NATIVE
if (cont->type == CONTINUATION_CONTEXT) { if (cont->type == CONTINUATION_CONTEXT) {
@ -420,7 +424,10 @@ cont_free(void *ptr)
rb_fiber_t *fib = (rb_fiber_t*)cont; rb_fiber_t *fib = (rb_fiber_t*)cont;
#if defined(FIBER_USE_COROUTINE) #if defined(FIBER_USE_COROUTINE)
coroutine_destroy(&fib->context); coroutine_destroy(&fib->context);
if (fib->ss_sp != NULL && !fiber_is_root_p(fib)) { if (fib->ss_sp != NULL) {
if (fiber_is_root_p(fib)) {
rb_bug("Illegal root fiber parameter");
}
#ifdef _WIN32 #ifdef _WIN32
VirtualFree((void*)fib->ss_sp, 0, MEM_RELEASE); VirtualFree((void*)fib->ss_sp, 0, MEM_RELEASE);
#else #else
@ -1522,6 +1529,7 @@ fiber_init(VALUE fibval, VALUE proc)
else { else {
vm_stack = ruby_xmalloc(fib_stack_bytes); vm_stack = ruby_xmalloc(fib_stack_bytes);
} }
cont->free_vm_stack = 1;
rb_ec_set_vm_stack(sec, vm_stack, fib_stack_bytes / sizeof(VALUE)); rb_ec_set_vm_stack(sec, vm_stack, fib_stack_bytes / sizeof(VALUE));
sec->cfp = (void *)(sec->vm_stack + sec->vm_stack_size); sec->cfp = (void *)(sec->vm_stack + sec->vm_stack_size);
@ -1658,7 +1666,7 @@ rb_threadptr_root_fiber_setup(rb_thread_t *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 = fib; VM_ASSERT(fib->cont.free_vm_stack == 0);
/* NOTE: On WIN32, fib_handle is not allocated yet. */ /* NOTE: On WIN32, fib_handle is not allocated yet. */
} }
@ -1672,6 +1680,8 @@ rb_threadptr_root_fiber_release(rb_thread_t *th)
else { else {
VM_ASSERT(th->ec->fiber_ptr->cont.type == FIBER_CONTEXT); VM_ASSERT(th->ec->fiber_ptr->cont.type == FIBER_CONTEXT);
VM_ASSERT(th->ec->fiber_ptr->cont.self == 0); VM_ASSERT(th->ec->fiber_ptr->cont.self == 0);
// th->ec->fiber_ptr->cont.saved_ec.vm_stack = NULL;
fiber_free(th->ec->fiber_ptr); fiber_free(th->ec->fiber_ptr);
if (th->ec == ruby_current_execution_context_ptr) { if (th->ec == ruby_current_execution_context_ptr) {
@ -1877,12 +1887,15 @@ rb_fiber_close(rb_fiber_t *fib)
size_t stack_bytes = ec->vm_stack_size * sizeof(VALUE); size_t stack_bytes = ec->vm_stack_size * sizeof(VALUE);
fiber_status_set(fib, FIBER_TERMINATED); fiber_status_set(fib, FIBER_TERMINATED);
if (fib->cont.free_vm_stack) {
if (stack_bytes == rb_ec_vm_ptr(ec)->default_params.thread_vm_stack_size) { if (stack_bytes == rb_ec_vm_ptr(ec)->default_params.thread_vm_stack_size) {
rb_thread_recycle_stack_release(vm_stack); rb_thread_recycle_stack_release(vm_stack);
} }
else { else {
ruby_xfree(vm_stack); ruby_xfree(vm_stack);
} }
}
rb_ec_set_vm_stack(ec, NULL, 0); rb_ec_set_vm_stack(ec, NULL, 0);
#if !FIBER_USE_NATIVE #if !FIBER_USE_NATIVE

2
thread.c
View file

@ -821,7 +821,7 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s
rb_threadptr_unlock_all_locking_mutexes(th); rb_threadptr_unlock_all_locking_mutexes(th);
rb_check_deadlock(th->vm); rb_check_deadlock(th->vm);
rb_ec_set_vm_stack(th->ec, NULL, 0); rb_fiber_close(th->ec->fiber_ptr);
} }
thread_cleanup_func(th, FALSE); thread_cleanup_func(th, FALSE);
gvl_release(th->vm); gvl_release(th->vm);