kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* gc.c (objspace_malloc_increase): should not invoke

Browse source 
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].



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45370 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2014-03-20 08:05:35 +00:00
parent c813697d97
commit 3e20c50d50
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -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> Thu Mar 20 13:05:16 2014 Koichi Sasada <ko1@atdot.net>
* struct.c (rb_struct_alloc): use RARRAY_CONST_PTR() instead of * struct.c (rb_struct_alloc): use RARRAY_CONST_PTR() instead of

4
gc.c
View file

@ -6038,12 +6038,12 @@ objspace_malloc_increase(rb_objspace_t *objspace, void *mem, size_t new_size, si
} }
if (type == MEMOP_TYPE_MALLOC) { 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); garbage_collect_with_gvl(objspace, FALSE, TRUE, GPR_FLAG_MALLOC);
} }
else { else {
retry: 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)) { if (ruby_thread_has_gvl_p() && is_lazy_sweeping(heap_eden)) {
gc_rest_sweep(objspace); /* rest_sweep can reduce malloc_increase */ gc_rest_sweep(objspace); /* rest_sweep can reduce malloc_increase */
goto retry; goto retry;