diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gc.c | 4 |
2 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,12 @@ +Thu Mar 20 16:53:07 2014 Koichi Sasada <ko1@atdot.net> + + * gc.c (objspace_malloc_increase): should not invoke + garbage_collect_with_gvl() here on non-ruby threads. + + Should just ignore the malloc_increase. + + This issue is pointed by Eric Wong [ruby-core:61519]. + Thu Mar 20 13:05:16 2014 Koichi Sasada <ko1@atdot.net> * struct.c (rb_struct_alloc): use RARRAY_CONST_PTR() instead of @@ -6038,12 +6038,12 @@ objspace_malloc_increase(rb_objspace_t *objspace, void *mem, size_t new_size, si } if (type == MEMOP_TYPE_MALLOC) { - if (ruby_gc_stress && !ruby_disable_gc_stress) { + if (ruby_gc_stress && !ruby_disable_gc_stress && ruby_native_thread_p()) { garbage_collect_with_gvl(objspace, FALSE, TRUE, GPR_FLAG_MALLOC); } else { retry: - if (malloc_increase > malloc_limit) { + if (malloc_increase > malloc_limit && ruby_native_thread_p()) { if (ruby_thread_has_gvl_p() && is_lazy_sweeping(heap_eden)) { gc_rest_sweep(objspace); /* rest_sweep can reduce malloc_increase */ goto retry; |