kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Update references when tracing allocations

Browse source 
The allocation tracing code keeps essentially a weak reference to
objects that have been allocated (storing the allocation information
along with the weak ref).  Compacting the heap would break references in
this weak map, so the wrong values could be returned.

This commit just updates the values in the weak ref in order to fix the
allocation tracing book keeping
This commit is contained in:
Aaron Patterson 2020-08-18 17:34:03 -07:00 • committed by Aaron Patterson
parent 371c051ca8
commit 7a58ee9b96
Notes: git 2020-08-19 11:11:19 +09:00
2 changed files with 78 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
ext/objspace/object_tracing.c
View file

@ -151,6 +151,80 @@ free_values_i(st_data_t key, st_data_t value, st_data_t data)
return ST_CONTINUE;
}
static void
allocation_info_tracer_mark(void *ptr)
{
struct traceobj_arg *trace_arg = (struct traceobj_arg *)ptr;
rb_gc_mark(trace_arg->newobj_trace);
rb_gc_mark(trace_arg->freeobj_trace);
}
static void
allocation_info_tracer_free(void *ptr)
{
struct traceobj_arg *arg = (struct traceobj_arg *)ptr;
/* clear tables */
st_foreach(arg->object_table, free_values_i, 0);
st_free_table(arg->object_table);
st_foreach(arg->str_table, free_keys_i, 0);
st_free_table(arg->str_table);
xfree(arg);
}
static size_t
allocation_info_tracer_memsize(const void *ptr)
{
size_t size;
struct traceobj_arg *trace_arg = (struct traceobj_arg *)ptr;
size = sizeof(*trace_arg);
size += st_memsize(trace_arg->object_table);
size += st_memsize(trace_arg->str_table);
return size;
}
static int
hash_foreach_should_replace_key(st_data_t key, st_data_t value, st_data_t argp, int error)
{
VALUE allocated_object;
allocated_object = (VALUE)value;
if (allocated_object != rb_gc_location(allocated_object)) {
return ST_REPLACE;
}
return ST_CONTINUE;
}
static int
hash_replace_key(st_data_t *key, st_data_t *value, st_data_t argp, int existing)
{
*key = rb_gc_location((VALUE)*key);
return ST_CONTINUE;
}
static void
allocation_info_tracer_compact(void *ptr)
{
struct traceobj_arg *trace_arg = (struct traceobj_arg *)ptr;
if (st_foreach_with_replace(trace_arg->object_table, hash_foreach_should_replace_key, hash_replace_key, 0)) {
rb_raise(rb_eRuntimeError, "hash modified during iteration");
}
}
static const rb_data_type_t allocation_info_tracer_type = {
"ObjectTracing/allocation_info_tracer",
{
allocation_info_tracer_mark,
allocation_info_tracer_free, /* Never called because global */
allocation_info_tracer_memsize,
allocation_info_tracer_compact,
},
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static VALUE traceobj_arg;
static struct traceobj_arg *tmp_trace_arg; /* TODO: Do not use global variables */
static int tmp_keep_remains; /* TODO: Do not use global variables */
@ -158,7 +232,9 @@ static struct traceobj_arg *
get_traceobj_arg(void)
{
if (tmp_trace_arg == 0) {
tmp_trace_arg = ALLOC_N(struct traceobj_arg, 1);
VALUE obj = TypedData_Make_Struct(rb_cObject, struct traceobj_arg, &allocation_info_tracer_type, tmp_trace_arg);
traceobj_arg = obj;
rb_gc_register_mark_object(traceobj_arg);
tmp_trace_arg->running = 0;
tmp_trace_arg->keep_remains = tmp_keep_remains;
tmp_trace_arg->newobj_trace = 0;
@ -186,9 +262,7 @@ trace_object_allocations_start(VALUE self)
else {
if (arg->newobj_trace == 0) {
arg->newobj_trace = rb_tracepoint_new(0, RUBY_INTERNAL_EVENT_NEWOBJ, newobj_i, arg);
rb_gc_register_mark_object(arg->newobj_trace);
arg->freeobj_trace = rb_tracepoint_new(0, RUBY_INTERNAL_EVENT_FREEOBJ, freeobj_i, arg);
rb_gc_register_mark_object(arg->freeobj_trace);
}
rb_tracepoint_enable(arg->newobj_trace);
rb_tracepoint_enable(arg->freeobj_trace);

2
test/objspace/test_objspace.rb
View file

@ -194,7 +194,7 @@ class TestObjSpace < Test::Unit::TestCase
assert_equal(self.class.name, ObjectSpace.allocation_class_path(o3))
assert_equal(__method__, ObjectSpace.allocation_method_id(o3))
}
end if false # TODO: tenderlove is debugging it [Tue Aug 18 11:00:49 2020 JST]
end
def test_trace_object_allocations_start_stop_clear
ObjectSpace.trace_object_allocations_clear # clear object_table to get rid of erroneous detection for obj3