Expose rb_obj_seen_id to objspace_dump

Author: eightbitraptor

ext/objspace/objspace_dump.c

@@ -636,6 +636,11 @@ dump_object(VALUE obj, struct dump_config *dc)
         dump_append_sizet(dc, memsize);
     }
 
+    if (rb_obj_id_seen_p(obj)) {
+        dump_append(dc, ", \"object_id\":");
+        dump_append_lu(dc, RB_NUM2ULONG(rb_obj_id(obj)));
+    }
+
     struct rb_gc_object_metadata_entry *gc_metadata = rb_gc_object_metadata(obj);
     for (int i = 0; gc_metadata[i].name != 0; i++) {
         if (i == 0) {

gc.c

@@ -665,6 +665,7 @@ typedef struct gc_function_map {
     // Object ID
     VALUE (*object_id)(void *objspace_ptr, VALUE obj);
     VALUE (*object_id_to_ref)(void *objspace_ptr, VALUE object_id);
+    bool (*object_id_seen_p)(VALUE obj);
     // Forking
     void (*before_fork)(void *objspace_ptr);
     void (*after_fork)(void *objspace_ptr, rb_pid_t pid);
@@ -842,6 +843,7 @@ ruby_modular_gc_init(void)
     // Object ID
     load_modular_gc_func(object_id);
     load_modular_gc_func(object_id_to_ref);
+    load_modular_gc_func(object_id_seen_p);
     // Forking
     load_modular_gc_func(before_fork);
     load_modular_gc_func(after_fork);
@@ -925,6 +927,7 @@ ruby_modular_gc_init(void)
 // Object ID
 # define rb_gc_impl_object_id rb_gc_functions.object_id
 # define rb_gc_impl_object_id_to_ref rb_gc_functions.object_id_to_ref
+# define rb_gc_impl_object_id_seen_p rb_gc_functions.object_id_seen_p
 // Forking
 # define rb_gc_impl_before_fork rb_gc_functions.before_fork
 # define rb_gc_impl_after_fork rb_gc_functions.after_fork
@@ -1887,6 +1890,12 @@ rb_obj_id(VALUE obj)
     return rb_find_object_id(rb_gc_get_objspace(), obj, rb_gc_impl_object_id);
 }
 
+bool
+rb_obj_id_seen_p(VALUE obj)
+{
+    return rb_gc_impl_object_id_seen_p(obj);
+}
+
 static enum rb_id_table_iterator_result
 cc_table_memsize_i(VALUE ccs_ptr, void *data_ptr)
 {

gc/default/default.c

@@ -834,8 +834,8 @@ RVALUE_AGE_GET(VALUE obj)
     return RVALUE_METADATA(obj)->age;
 }
 
-static bool
-RVALUE_SEEN_OBJ_ID(VALUE obj)
+bool
+rb_gc_impl_object_id_seen_p(VALUE obj)
 {
     return RVALUE_METADATA(obj)->seen_obj_id;
 }
@@ -1584,7 +1584,7 @@ rb_gc_impl_object_id(void *objspace_ptr, VALUE obj)
     rb_objspace_t *objspace = objspace_ptr;
 
     unsigned int lev = rb_gc_vm_lock();
-    if (RVALUE_SEEN_OBJ_ID(obj)) {
+    if (rb_gc_impl_object_id_seen_p(obj)) {
         st_data_t val;
         if (st_lookup(objspace->obj_to_id_tbl, (st_data_t)obj, &val)) {
             id = (VALUE)val;
@@ -2656,7 +2656,7 @@ obj_free_object_id(rb_objspace_t *objspace, VALUE obj)
 {
     st_data_t o = (st_data_t)obj, id;
 
-    GC_ASSERT(BUILTIN_TYPE(obj) == T_NONE || RVALUE_SEEN_OBJ_ID(obj));
+    GC_ASSERT(BUILTIN_TYPE(obj) == T_NONE || rb_gc_impl_object_id_seen_p(obj));
     RVALUE_METADATA(obj)->seen_obj_id = false;
 
     if (st_delete(objspace->obj_to_id_tbl, &o, &id)) {
@@ -2890,7 +2890,7 @@ rb_gc_impl_copy_finalizer(void *objspace_ptr, VALUE dest, VALUE obj)
 static VALUE
 get_object_id_in_finalizer(rb_objspace_t *objspace, VALUE obj)
 {
-    if (RVALUE_SEEN_OBJ_ID(obj)) {
+    if (rb_gc_impl_object_id_seen_p(obj)) {
         return rb_gc_impl_object_id(objspace, obj);
     }
     else {
@@ -2946,7 +2946,7 @@ finalize_list(rb_objspace_t *objspace, VALUE zombie)
         int lev = rb_gc_vm_lock();
         {
             GC_ASSERT(BUILTIN_TYPE(zombie) == T_ZOMBIE);
-            if (RVALUE_SEEN_OBJ_ID(zombie)) {
+            if (rb_gc_impl_object_id_seen_p(zombie)) {
                 obj_free_object_id(objspace, zombie);
             }
 
@@ -3554,7 +3554,7 @@ gc_sweep_plane(rb_objspace_t *objspace, rb_heap_t *heap, uintptr_t p, bits_t bit
 
                 rb_gc_event_hook(vp, RUBY_INTERNAL_EVENT_FREEOBJ);
 
-                bool has_object_id = RVALUE_SEEN_OBJ_ID(vp);
+                bool has_object_id = rb_gc_impl_object_id_seen_p(vp);
                 rb_gc_obj_free_vm_weak_references(vp);
                 if (rb_gc_obj_free(objspace, vp)) {
                     if (has_object_id) {
@@ -6239,7 +6239,7 @@ rb_gc_impl_object_metadata(void *objspace_ptr, VALUE obj)
     if (RVALUE_MARKING(objspace, obj)) SET_ENTRY(marking, Qtrue);
     if (RVALUE_MARKED(objspace, obj)) SET_ENTRY(marked, Qtrue);
     if (RVALUE_PINNED(objspace, obj)) SET_ENTRY(pinned, Qtrue);
-    if (RVALUE_SEEN_OBJ_ID(obj)) SET_ENTRY(object_id, rb_obj_id(obj));
+    if (rb_gc_impl_object_id_seen_p(obj)) SET_ENTRY(object_id, rb_obj_id(obj));
 
     object_metadata_entries[n].name = 0;
     object_metadata_entries[n].val = 0;
@@ -6957,7 +6957,7 @@ gc_move(rb_objspace_t *objspace, VALUE src, VALUE dest, size_t src_slot_size, si
     CLEAR_IN_BITMAP(GET_HEAP_UNCOLLECTIBLE_BITS(src), src);
     CLEAR_IN_BITMAP(GET_HEAP_PAGE(src)->remembered_bits, src);
 
-    if (RVALUE_SEEN_OBJ_ID(src)) {
+    if (rb_gc_impl_object_id_seen_p(src)) {
         /* If the source object's object_id has been seen, we need to update
          * the object to object id mapping. */
         st_data_t srcid = (st_data_t)src, id;

gc/default/exts.mk

@@ -0,0 +1,85 @@
+V = 0
+V0 = $(V:0=)
+Q1 = $(V:1=)
+Q = $(Q1:0=@)
+ECHO1 = $(V:1=@:)
+ECHO = $(ECHO1:0=@echo)
+override MFLAGS := $(filter-out -j%,$(MFLAGS))
+ext_build_dir = gc/default
+
+ruby = $(topdir)/miniruby -I'$(topdir)' -I'$(top_srcdir)/lib' \
+       -I'$(extout)/$(arch)' -I'$(extout)/common'
+RUBY = $(ruby)
+extensions = gc/default/.
+EXTOBJS = dmyext.o
+EXTLIBS =
+EXTSO =
+EXTLDFLAGS =
+EXTINITS =
+SUBMAKEOPTS = EXTOBJS="$(EXTOBJS) $(EXTENCS)" EXTLIBS="$(EXTLIBS)" \
+	      EXTLDFLAGS="$(EXTLDFLAGS)" EXTINITS="$(EXTINITS)" \
+	      SHOWFLAGS=
+NOTE_MESG = $(RUBY) $(top_srcdir)/tool/lib/colorize.rb skip
+NOTE_NAME = $(RUBY) $(top_srcdir)/tool/lib/colorize.rb fail
+RM = rm -f
+RMDIRS = rmdir -p
+RMDIR = rmdir
+RMALL = rm -fr
+MESSAGE_BEGIN = @for line in
+MESSAGE_END = ; do echo "$$line"; done
+
+all: $(extensions:/.=/all)
+all: note
+install: $(extensions:/.=/install)
+install: note
+static: $(extensions:/.=/static)
+static: note
+install-so: $(extensions:/.=/install-so)
+install-so: note
+install-rb: $(extensions:/.=/install-rb)
+install-rb: note
+clean: $(extensions:/.=/clean)
+distclean: $(extensions:/.=/distclean)
+realclean: $(extensions:/.=/realclean)
+
+clean:
+	-$(Q)$(RM) ext/extinit.o
+distclean:
+	-$(Q)$(RM) ext/extinit.c
+
+ruby: $(extensions:/.=/all)
+all static: ruby
+ruby: $(EXTOBJS)
+ruby:
+	$(Q)$(MAKE) $(MFLAGS) $(SUBMAKEOPTS) $@
+libencs:
+	$(Q)$(MAKE) -f enc.mk V=$(V) $@
+
+gc/default/all:
+	$(Q)$(MAKE) -C $(@D) $(MFLAGS) V=$(V) $(@F)
+gc/default/install:
+	$(Q)$(MAKE) -C $(@D) $(MFLAGS) V=$(V) $(@F)
+gc/default/static:
+	$(Q)$(MAKE) -C $(@D) $(MFLAGS) V=$(V) $(@F)
+gc/default/install-so:
+	$(Q)$(MAKE) -C $(@D) $(MFLAGS) V=$(V) $(@F)
+gc/default/install-rb:
+	$(Q)$(MAKE) -C $(@D) $(MFLAGS) V=$(V) $(@F)
+gc/default/clean: clean-local
+	$(Q)$(MAKE) -C $(@D) $(MFLAGS) V=$(V) $(@F)
+gc/default/distclean: clean-local
+	$(Q)$(MAKE) -C $(@D) $(MFLAGS) V=$(V) $(@F)
+	$(Q)$(RM) $(ext_build_dir)/exts.mk
+	$(Q)$(RMDIRS) $(@D)
+gc/default/realclean: clean-local
+	$(Q)$(MAKE) -C $(@D) $(MFLAGS) V=$(V) $(@F)
+	$(Q)$(RM) $(ext_build_dir)/exts.mk
+	$(Q)$(RMDIRS) $(@D)
+
+clean-local:
+	$(Q)$(RM) $(ext_build_dir)/*~ $(ext_build_dir)/*.bak $(ext_build_dir)/core
+
+extso:
+	@echo EXTSO=$(EXTSO)
+
+note:

internal/gc.h

@@ -252,6 +252,7 @@ VALUE rb_wb_protected_newobj_of(struct rb_execution_context_struct *, VALUE, VAL
 VALUE rb_wb_unprotected_newobj_of(VALUE, VALUE, size_t);
 size_t rb_obj_memsize_of(VALUE);
 struct rb_gc_object_metadata_entry *rb_gc_object_metadata(VALUE obj);
+bool rb_obj_id_seen_p(VALUE obj);
 void rb_gc_mark_values(long n, const VALUE *values);
 void rb_gc_mark_vm_stack_values(long n, const VALUE *values);
 void rb_gc_update_values(long n, VALUE *values);