Skip to content

Report SIP survivors #67940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cshung merged 2 commits into from
Apr 14, 2022
Merged

Report SIP survivors #67940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8deb919
Report SIP survivors
cshung Apr 13, 2022
1ce3b37
Code review feedback
cshung Apr 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 41 additions & 10 deletions src/coreclr/gc/gc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32150,11 +32150,7 @@ void gc_heap::walk_relocation (void* profiling_context, record_surv_fn fn)
generation* condemned_gen = generation_of (i);
heap_segment* current_heap_segment = heap_segment_rw (generation_start_segment (condemned_gen));
#ifdef USE_REGIONS
while (current_heap_segment && heap_segment_swept_in_plan (current_heap_segment))
{
// TODO: Walk the heap segment and report the plugs.
current_heap_segment = heap_segment_next_rw (current_heap_segment);
}
current_heap_segment = walk_relocation_sip (current_heap_segment, profiling_context, fn);
if (!current_heap_segment)
continue;
#endif // USE_REGIONS
Expand Down Expand Up @@ -32187,11 +32183,7 @@ void gc_heap::walk_relocation (void* profiling_context, record_surv_fn fn)
}
current_heap_segment = heap_segment_next_rw (current_heap_segment);
#ifdef USE_REGIONS
while (current_heap_segment && heap_segment_swept_in_plan (current_heap_segment))
{
// TODO: Walk the heap segment and report the plugs.
current_heap_segment = heap_segment_next_rw (current_heap_segment);
}
current_heap_segment = walk_relocation_sip (current_heap_segment, profiling_context, fn);
#endif // USE_REGIONS
if (current_heap_segment)
{
Expand All @@ -32218,6 +32210,45 @@ void gc_heap::walk_relocation (void* profiling_context, record_surv_fn fn)
}
}

#ifdef USE_REGIONS
heap_segment* gc_heap::walk_relocation_sip (heap_segment* current_heap_segment, void* profiling_context, record_surv_fn fn)
{
while (current_heap_segment && heap_segment_swept_in_plan (current_heap_segment))
{
uint8_t* start = heap_segment_mem (current_heap_segment);
uint8_t* end = heap_segment_allocated (current_heap_segment);
uint8_t* obj = start;
uint8_t* plug_start = nullptr;
while (obj < end)
{
if (((CObjectHeader*)obj)->IsFree())
{
if (plug_start)
{
fn (plug_start, obj, 0, profiling_context, false, false);
plug_start = nullptr;
}
}
else
{
if (!plug_start)
{
plug_start = obj;
}
}

obj += Align (size (obj));
}
if (plug_start)
{
fn (plug_start, end, 0, profiling_context, false, false);
}
current_heap_segment = heap_segment_next_rw (current_heap_segment);
}
return current_heap_segment;
}
#endif // USE_REGIONS

void gc_heap::walk_survivors (record_surv_fn fn, void* context, walk_surv_type type)
{
if (type == walk_for_gc)
Expand Down
5 changes: 4 additions & 1 deletion src/coreclr/gc/gcpriv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1647,7 +1647,10 @@ class gc_heap

PER_HEAP
void walk_relocation (void* profiling_context, record_surv_fn fn);

#ifdef USE_REGIONS
PER_HEAP
heap_segment* walk_relocation_sip (heap_segment* current_heap_segment, void* profiling_context, record_surv_fn fn);
#endif // USE_REGIONS
PER_HEAP
void walk_relocation_in_brick (uint8_t* tree, walk_relocate_args* args);

Expand Down