1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gc.c (define_final0): avoid duplicate blocks

Browse Source 
This prevents excessive memory growth when a WeakRef
is repeatedly created

* gc.c (define_final0): avoid duplicate blocks
  [Bug #10537]
* test/test_weakref.rb (test_repeated_object_leak): new test

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48820 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2014-12-13 01:28:18 +00:00
parent 58d992ec44
commit 856903850b
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Dec 13 09:58:41 2014 Eric Wong <e@80x24.org>
* gc.c (define_final0): avoid duplicate blocks
[Bug #10537]
* test/test_weakref.rb (test_repeated_object_leak): new test
Sat Dec 13 04:59:20 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Dec 13 04:59:20 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bin/erb (ERB::Main#run): get rid of shadowing outer local * bin/erb (ERB::Main#run): get rid of shadowing outer local

14
gc.c
View File

@ -2370,6 +2370,20 @@ define_final0(VALUE obj, VALUE block)
if (st_lookup(finalizer_table, obj, &data)) { if (st_lookup(finalizer_table, obj, &data)) {
table = (VALUE)data; table = (VALUE)data;
/* avoid duplicate block, table is usually small */
{
const VALUE *ptr = RARRAY_CONST_PTR(table);
long len = RARRAY_LEN(table);
long i;
for (i = 0; i < len; i++, ptr++) {
if (rb_funcall(*ptr, idEq, 1, block)) {
return *ptr;
}
}
}
rb_ary_push(table, block); rb_ary_push(table, block);
} }
else { else {

8
test/test_weakref.rb
View File

@ -60,4 +60,12 @@ class TestWeakRef < Test::Unit::TestCase
end end
}, bug7304 }, bug7304
end end
def test_repeated_object_leak
bug10537 = '[ruby-core:66428]'
assert_no_memory_leak(%w(-rweakref), '', <<-'end;', bug10537)
a = Object.new
150_000.times { WeakRef.new(a) }
end;
end
end end