diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-03-29 04:37:06 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-03-29 04:37:06 +0000 |
commit | 835186a322d8a812cdbeb2f00ecd642cffde9fee (patch) | |
tree | 82dc80b097ccc652935b9533a4a49451e1d72263 | |
parent | ec02cc293d7e760f0d66176d14b1b37c608acef2 (diff) | |
download | ruby-835186a322d8a812cdbeb2f00ecd642cffde9fee.tar.gz |
* gc.c (gc_before_sweep): cap `malloc_limit' to
gc_params.malloc_limit_max. It can grow and grow with such case:
`loop{"a" * (1024 ** 2)}'
[Bug #9687]
This issue is pointed by Tim Robertson.
http://www.omniref.com/blog/blog/2014/03/27/ruby-garbage-collection-still-not-ready-for-production/
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45468 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | gc.c | 2 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,13 @@ +Sat Mar 29 13:04:22 2014 Koichi Sasada <ko1@atdot.net> + + * gc.c (gc_before_sweep): cap `malloc_limit' to + gc_params.malloc_limit_max. It can grow and grow with such case: + `loop{"a" * (1024 ** 2)}' + [Bug #9687] + + This issue is pointed by Tim Robertson. + http://www.omniref.com/blog/blog/2014/03/27/ruby-garbage-collection-still-not-ready-for-production/ + Fri Mar 28 19:32:13 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * struct.c (not_a_member): extract name error and use same error @@ -2890,7 +2890,7 @@ gc_before_sweep(rb_objspace_t *objspace) malloc_limit = (size_t)(inc * gc_params.malloc_limit_growth_factor); if (gc_params.malloc_limit_max > 0 && /* ignore max-check if 0 */ malloc_limit > gc_params.malloc_limit_max) { - malloc_limit = inc; + malloc_limit = gc_params.malloc_limit_max; } } else { |