7 files changed, 248 insertions, 40 deletions
@@ -14217,6 +14217,7 @@ shape.$(OBJEXT): {$(VPATH)}shape.c
 shape.$(OBJEXT): {$(VPATH)}shape.h
 shape.$(OBJEXT): {$(VPATH)}st.h
 shape.$(OBJEXT): {$(VPATH)}subst.h
 shape.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 shape.$(OBJEXT): {$(VPATH)}thread_native.h
 shape.$(OBJEXT): {$(VPATH)}variable.h
@@ -556,6 +556,7 @@ objspace_dump.o: $(top_srcdir)/node.h
 objspace_dump.o: $(top_srcdir)/ruby_assert.h
 objspace_dump.o: $(top_srcdir)/ruby_atomic.h
 objspace_dump.o: $(top_srcdir)/shape.h
 objspace_dump.o: $(top_srcdir)/thread_pthread.h
 objspace_dump.o: $(top_srcdir)/vm_core.h
 objspace_dump.o: $(top_srcdir)/vm_opts.h
@@ -6,6 +6,7 @@ module ObjectSpace
 class << self
 private :_dump
 private :_dump_all
 end
 module_function
@@ -53,23 +54,38 @@ module ObjectSpace
 #
 # Dump the contents of the ruby heap as JSON.
 #
 # _since_ must be a non-negative integer or +nil+.
 #
 # If _since_ is a positive integer, only objects of that generation and
 # newer generations are dumped. The current generation can be accessed using
- # GC::count.
- #
- # Objects that were allocated without object allocation tracing enabled
 # are ignored. See ::trace_object_allocations for more information and
 # examples.
 #
 # If _since_ is omitted or is +nil+, all objects are dumped.
 #
 # This method is only expected to work with C Ruby.
 # This is an experimental method and is subject to change.
 # In particular, the function signature and output format are
 # not guaranteed to be compatible in future versions of ruby.
- def dump_all(output: :file, full: false, since: nil)
 out = case output
 when :file, nil
 require 'tempfile'
@@ -84,7 +100,46 @@ module ObjectSpace
 raise ArgumentError, "wrong output option: #{output.inspect}"
 end
- ret = _dump_all(out, full, since)
 return nil if output == :stdout
 ret
 end
@@ -18,6 +18,8 @@
 #include "internal/hash.h"
 #include "internal/string.h"
 #include "internal/sanitizers.h"
 #include "node.h"
 #include "objspace.h"
 #include "ruby/debug.h"
@@ -42,6 +44,7 @@ struct dump_config {
 unsigned int full_heap: 1;
 unsigned int partial_dump;
 size_t since;
 unsigned long buffer_len;
 char buffer[BUFFER_CAPACITY];
 };
@@ -350,6 +353,20 @@ dump_append_string_content(struct dump_config *dc, VALUE obj)
 }
 }
 static void
 dump_object(VALUE obj, struct dump_config *dc)
 {
@@ -378,13 +395,16 @@ dump_object(VALUE obj, struct dump_config *dc)
 dump_append(dc, "{\"address\":");
 dump_append_ref(dc, obj);
- dump_append(dc, ", \"shape_id\":");
- dump_append_sizet(dc, rb_shape_get_shape_id(obj));
-
 dump_append(dc, ", \"type\":\"");
 dump_append(dc, obj_type(obj));
 dump_append(dc, "\"");
 dump_append(dc, ", \"slot_size\":");
 dump_append_sizet(dc, dc->cur_page_slot_size);
@@ -622,7 +642,7 @@ root_obj_i(const char *category, VALUE obj, void *data)
 }
 static void
-dump_output(struct dump_config *dc, VALUE output, VALUE full, VALUE since)
 {
 dc->full_heap = 0;
@@ -648,6 +668,8 @@ dump_output(struct dump_config *dc, VALUE output, VALUE full, VALUE since)
 else {
 dc->partial_dump = 0;
 }
 }
 static VALUE
@@ -672,18 +694,81 @@ objspace_dump(VALUE os, VALUE obj, VALUE output)
 dc.cur_page_slot_size = rb_gc_obj_slot_size(obj);
 }
- dump_output(&dc, output, Qnil, Qnil);
 dump_object(obj, &dc);
 return dump_result(&dc);
 }
 static VALUE
-objspace_dump_all(VALUE os, VALUE output, VALUE full, VALUE since)
 {
 struct dump_config dc = {0,};
- dump_output(&dc, output, full, since);
 if (!dc.partial_dump || dc.since == 0) {
 /* dump roots */
@@ -691,12 +776,28 @@ objspace_dump_all(VALUE os, VALUE output, VALUE full, VALUE since)
 if (dc.roots) dump_append(&dc, "]}\n");
 }
 /* dump all objects */
 rb_objspace_each_objects(heap_i, &dc);
 return dump_result(&dc);
 }
 void
 Init_objspace_dump(VALUE rb_mObjSpace)
 {
@@ -706,7 +807,8 @@ Init_objspace_dump(VALUE rb_mObjSpace)
 #endif
 rb_define_module_function(rb_mObjSpace, "_dump", objspace_dump, 2);
- rb_define_module_function(rb_mObjSpace, "_dump_all", objspace_dump_all, 3);
 /* force create static IDs */
 rb_obj_gc_flags(rb_mObjSpace, 0, 0);
@@ -2,6 +2,8 @@
 #include "vm_sync.h"
 #include "shape.h"
 #include "gc.h"
 #include "internal/class.h"
 #include "internal/symbol.h"
 #include "internal/variable.h"
@@ -37,6 +39,17 @@ rb_shape_root_shape_p(rb_shape_t* shape)
 return shape == rb_shape_get_root_shape();
 }
 rb_shape_t*
 rb_shape_get_shape_by_id(shape_id_t shape_id)
 {
@@ -97,10 +110,10 @@ rb_shape_get_shape_id(VALUE obj)
 #endif
 }
-unsigned int
 rb_shape_depth(rb_shape_t * shape)
 {
- unsigned int depth = 1;
 while (shape->parent_id != INVALID_SHAPE_ID) {
 depth++;
@@ -285,6 +298,7 @@ rb_shape_transition_shape_frozen(VALUE obj)
 rb_shape_t *
 rb_shape_get_next_iv_shape(rb_shape_t* shape, ID id)
 {
 return get_next_shape_internal(shape, id, SHAPE_IVAR);
 }
@@ -428,16 +442,45 @@ rb_shape_rebuild_shape(rb_shape_t * initial_shape, rb_shape_t * dest_shape)
 return midway_shape;
 }
 #if SHAPE_DEBUG
 VALUE rb_cShape;
 /*
 * Exposing Shape to Ruby via RubyVM.debug_shape
 */
 static const rb_data_type_t shape_data_type = {
- "Shape",
- {NULL, NULL, NULL,},
- 0, 0, RUBY_TYPED_FREE_IMMEDIATELY|RUBY_TYPED_WB_PROTECTED
 };
 static VALUE
@@ -480,12 +523,10 @@ rb_shape_parent_id(VALUE self)
 static VALUE
 parse_key(ID key)
 {
- if ((key & RUBY_ID_INTERNAL) == RUBY_ID_INTERNAL) {
- return LONG2NUM(key);
- }
- else {
 return ID2SYM(key);
 }
 }
 static VALUE
@@ -527,17 +568,13 @@ rb_shape_edge_name(VALUE self)
 rb_shape_t* shape;
 TypedData_Get_Struct(self, rb_shape_t, &shape_data_type, shape);
- if ((shape->edge_name & (ID_INTERNAL)) == ID_INTERNAL) {
- return INT2NUM(shape->capacity);
- }
- else {
- if (shape->edge_name) {
 return ID2SYM(shape->edge_name);
 }
- else {
- return Qnil;
- }
 }
 }
 static VALUE
@@ -563,13 +600,7 @@ rb_shape_export_depth(VALUE self)
 {
 rb_shape_t* shape;
 TypedData_Get_Struct(self, rb_shape_t, &shape_data_type, shape);
-
- unsigned int depth = 0;
- while (shape->parent_id != INVALID_SHAPE_ID) {
- depth++;
- shape = rb_shape_get_parent(shape);
- }
- return INT2NUM(depth);
 }
 static VALUE
@@ -124,7 +124,6 @@ bool rb_shape_root_shape_p(rb_shape_t* shape);
 rb_shape_t * rb_shape_get_root_shape(void);
 uint8_t rb_shape_id_num_bits(void);
 int32_t rb_shape_id_offset(void);
-unsigned int rb_shape_depth(rb_shape_t * shape);
 rb_shape_t* rb_shape_get_shape_by_id_without_assertion(shape_id_t shape_id);
 rb_shape_t * rb_shape_get_parent(rb_shape_t * shape);
@@ -184,4 +183,12 @@ bool rb_shape_set_shape_id(VALUE obj, shape_id_t shape_id);
 VALUE rb_obj_debug_shape(VALUE self, VALUE obj);
 VALUE rb_shape_flags_mask(void);
 #endif
@@ -414,7 +414,7 @@ class TestObjSpace < Test::Unit::TestCase
 @obj1 = Object.new
 GC.start
 @obj2 = Object.new
- ObjectSpace.dump_all(output: :stdout, since: gc_gen)
 end
 p dump_my_heap_please
@@ -422,7 +422,7 @@ class TestObjSpace < Test::Unit::TestCase
 assert_equal 'nil', output.pop
 since = output.shift.to_i
 assert_operator output.size, :>, 0
- generations = output.map { |l| JSON.parse(l)["generation"] }.uniq.sort
 assert_equal [since, since + 1], generations
 end
 end
@@ -479,6 +479,7 @@ class TestObjSpace < Test::Unit::TestCase
 output.each { |l|
 obj = JSON.parse(l)
 next if obj["type"] == "ROOT"
 assert_not_nil obj["slot_size"]
 assert_equal 0, obj["slot_size"] % GC::INTERNAL_CONSTANTS[:RVALUE_SIZE]
@@ -794,6 +795,16 @@ class TestObjSpace < Test::Unit::TestCase
 assert_equal name, JSON.parse(dump)["method"], dump
 end
 private
 def utf8_❨╯°□°❩╯︵┻━┻