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

Add age to rb_gc_object_metadata

Browse Source 
This will allow ObjectSpace.dump to output the age of the object.
This commit is contained in:
Peter Zhu 2025-02-18 13:45:27 -05:00
parent 5acfe30880
commit 5e45f2a0bc
Notes: git 2025-02-19 14:47:46 +00:00 
Merged: https://github.com/ruby/ruby/pull/12777
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gc/default/default.c
View File

@ -6197,11 +6197,12 @@ rb_gc_impl_object_metadata(void *objspace_ptr, VALUE obj)
{ {
rb_objspace_t *objspace = objspace_ptr; rb_objspace_t *objspace = objspace_ptr;
size_t n = 0; size_t n = 0;
static ID ID_wb_protected, ID_old, ID_uncollectible, ID_marking, ID_marked, ID_pinned; static ID ID_wb_protected, ID_age, ID_old, ID_uncollectible, ID_marking, ID_marked, ID_pinned;
if (!ID_marked) { if (!ID_marked) {
#define I(s) ID_##s = rb_intern(#s); #define I(s) ID_##s = rb_intern(#s);
I(wb_protected); I(wb_protected);
I(age);
I(old); I(old);
I(uncollectible); I(uncollectible);
I(marking); I(marking);
@ -6218,6 +6219,7 @@ rb_gc_impl_object_metadata(void *objspace_ptr, VALUE obj)
} while (0) } while (0)
if (!RVALUE_WB_UNPROTECTED(objspace, obj)) SET_ENTRY(wb_protected, Qtrue); if (!RVALUE_WB_UNPROTECTED(objspace, obj)) SET_ENTRY(wb_protected, Qtrue);
SET_ENTRY(age, INT2FIX(RVALUE_AGE_GET(obj)));
if (RVALUE_OLD_P(objspace, obj)) SET_ENTRY(old, Qtrue); if (RVALUE_OLD_P(objspace, obj)) SET_ENTRY(old, Qtrue);
if (RVALUE_UNCOLLECTIBLE(objspace, obj)) SET_ENTRY(uncollectible, Qtrue); if (RVALUE_UNCOLLECTIBLE(objspace, obj)) SET_ENTRY(uncollectible, Qtrue);
if (RVALUE_MARKING(objspace, obj)) SET_ENTRY(marking, Qtrue); if (RVALUE_MARKING(objspace, obj)) SET_ENTRY(marking, Qtrue);

16
test/objspace/test_objspace.rb
View File

@ -332,11 +332,25 @@ class TestObjSpace < Test::Unit::TestCase
# Ensure that the fstring is promoted to old generation # Ensure that the fstring is promoted to old generation
4.times { GC.start } 4.times { GC.start }
info = ObjectSpace.dump("foo".freeze) info = ObjectSpace.dump("foo".freeze)
assert_match(/"wb_protected":true, "old":true/, info) assert_include(info, '"wb_protected":true')
assert_include(info, '"age":3')
assert_include(info, '"old":true')
assert_match(/"fstring":true/, info) assert_match(/"fstring":true/, info)
JSON.parse(info) if defined?(JSON) JSON.parse(info) if defined?(JSON)
end end
def test_dump_flag_age
EnvUtil.without_gc do
o = Object.new
assert_include(ObjectSpace.dump(o), '"age":0')
GC.start
assert_include(ObjectSpace.dump(o), '"age":1')
end
end
if defined?(RubyVM::Shape) if defined?(RubyVM::Shape)
class TooComplex; end class TooComplex; end