diff options
author | tarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-19 22:48:03 +0000 |
---|---|---|
committer | tarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-19 22:48:03 +0000 |
commit | 88927b04aeb85d83b7b463d57f8bf49d57a57d64 (patch) | |
tree | de8df3af4fa949021013324519a4dba0bcd24c5c | |
parent | d7ebd9e641965e8a54d9dc9d53bbde642cd0ef0e (diff) | |
download | ruby-88927b04aeb85d83b7b463d57f8bf49d57a57d64.tar.gz |
* gc.c (rb_gc_writebarrier): give up rescan A and register B directly
if A has huge number of children.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41460 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | gc.c | 19 |
2 files changed, 21 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Thu Jun 20 07:46:48 2013 Masaya Tarui <tarui@ruby-lang.org> + + * gc.c (rb_gc_writebarrier): give up rescan A and register B directly + if A has huge number of children. + Thu Jun 20 07:30:35 2013 Koichi Sasada <ko1@atdot.net> * common.mk: add new rules `gcbench-rdoc', `gcbench-hash'. @@ -3786,6 +3786,7 @@ void rb_gc_writebarrier(VALUE a, VALUE b) { rb_objspace_t *objspace = &rb_objspace; + int type; if (RGENGC_CHECK_MODE) { if (!RVALUE_PROMOTED(a)) rb_bug("rb_gc_wb: referer object %p (%s) is not promoted.\n", (void *)a, obj_type_name(a)); @@ -3793,9 +3794,21 @@ rb_gc_writebarrier(VALUE a, VALUE b) } if (!rgengc_remembered(objspace, a)) { - rgengc_report(2, objspace, "rb_gc_wb: %p (%s) -> %p (%s)\n", - (void *)a, obj_type_name(a), (void *)b, obj_type_name(b)); - rgengc_remember(objspace, a); + type = BUILTIN_TYPE(a); + /* TODO: 2 << 16 is just a magic number. */ + if ((type == T_ARRAY && RARRAY_LEN(a) >= 2 << 16) || + (type == T_HASH && RHASH_SIZE(a) >= 2 << 16)) { + if (!rgengc_remembered(objspace, b)) { + rgengc_report(2, objspace, "rb_gc_wb: %p (%s) -> %p (%s)\n", + (void *)a, obj_type_name(a), (void *)b, obj_type_name(b)); + rgengc_remember(objspace, b); + } + } + else { + rgengc_report(2, objspace, "rb_gc_wb: %p (%s) -> %p (%s)\n", + (void *)a, obj_type_name(a), (void *)b, obj_type_name(b)); + rgengc_remember(objspace, a); + } } } |