mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* gc.c (vm_malloc_increase): check GVL before gc_rest_sweep().
vm_malloc_increase() can be called without GVL. However, gc_rest_sweep() assumes acquiring GVL. To avoid this problem, check GVL before gc_rest_sweep(). [Bug #9090] This workaround introduces possibility to set malloc_limit as wrong value (*1). However, this may be rare case. So I commit it. *1: Without rest_sweep() here, gc_rest_sweep() can decrease malloc_increase due to ruby_sized_xfree(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
10b6409eb3
commit
bc31909366
2 changed files with 15 additions and 1 deletions
14
ChangeLog
14
ChangeLog
|
@ -1,3 +1,17 @@
|
|||
Fri Nov 8 02:44:29 2013 Koichi Sasada <ko1@atdot.net>
|
||||
|
||||
* gc.c (vm_malloc_increase): check GVL before gc_rest_sweep().
|
||||
vm_malloc_increase() can be called without GVL.
|
||||
However, gc_rest_sweep() assumes acquiring GVL.
|
||||
To avoid this problem, check GVL before gc_rest_sweep().
|
||||
[Bug #9090]
|
||||
|
||||
This workaround introduces possibility to set malloc_limit as
|
||||
wrong value (*1). However, this may be rare case. So I commit it.
|
||||
|
||||
*1: Without rest_sweep() here, gc_rest_sweep() can decrease
|
||||
malloc_increase due to ruby_sized_xfree().
|
||||
|
||||
Fri Nov 8 02:50:25 2013 Zachary Scott <e@zzak.io>
|
||||
|
||||
* lib/securerandom.rb: [DOC] specify arguments passed to ::random_bytes
|
||||
|
|
2
gc.c
2
gc.c
|
@ -5446,7 +5446,7 @@ vm_malloc_increase(rb_objspace_t *objspace, size_t new_size, size_t old_size, in
|
|||
else {
|
||||
retry:
|
||||
if (malloc_increase > malloc_limit) {
|
||||
if (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 */
|
||||
goto retry;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue