Skip to content

Diaggc skip frozen segments #252

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

Closed
alexey-zakharov wants to merge 3 commits into from
Closed

Diaggc skip frozen segments #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13a053a
Skip ro segments which are not in range when walking heap for GC diag…
alexey-zakharov Mar 11, 2024
9c9eee8
Exposed coreclr_unity_profiler_get_managed_assembly_load_context API …
alexey-zakharov Mar 12, 2024
269c6fb
Avoid clearing thread local handles for already unloaded loader
alexey-zakharov Mar 12, 2024
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
1 change: 1 addition & 0 deletions src/coreclr/dlls/mscoree/mscorwks_ntdef.src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ EXPORTS
; mono
coreclr_image_get_custom_attribute_data
coreclr_unity_profiler_register
coreclr_unity_profiler_get_managed_assembly_load_context
coreclr_unity_gc_concurrent_mode
mono_array_element_size
mono_assembly_get_assemblyref
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/dlls/mscoree/mscorwks_unixexports.src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ MetaDataGetDispenser
; mono
coreclr_image_get_custom_attribute_data
coreclr_unity_profiler_register
coreclr_unity_profiler_get_managed_assembly_load_context
coreclr_unity_gc_concurrent_mode
mono_array_element_size
mono_assembly_get_assemblyref
Expand Down
10 changes: 5 additions & 5 deletions src/coreclr/gc/gc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51918,7 +51918,7 @@ void CFinalize::CheckFinalizerObjects()
void gc_heap::walk_heap_per_heap (walk_fn fn, void* context, int gen_number, BOOL walk_large_object_heap_p)
{
generation* gen = gc_heap::generation_of (gen_number);
heap_segment* seg = generation_start_segment (gen);
heap_segment* seg = heap_segment_in_range (generation_start_segment (gen));
uint8_t* x = ((gen_number == max_generation) ? heap_segment_mem (seg) : get_soh_start_object (seg, gen));
uint8_t* end = heap_segment_allocated (seg);
int align_const = get_alignment_constant (TRUE);
Expand All @@ -51928,7 +51928,7 @@ void gc_heap::walk_heap_per_heap (walk_fn fn, void* context, int gen_number, BOO
{
if (x >= end)
{
if ((seg = heap_segment_next (seg)) != 0)
if ((seg = heap_segment_next_in_range (seg)) != 0)
{
x = heap_segment_mem (seg);
end = heap_segment_allocated (seg);
Expand All @@ -51940,7 +51940,7 @@ void gc_heap::walk_heap_per_heap (walk_fn fn, void* context, int gen_number, BOO
// advance to next lower generation
gen_number--;
gen = gc_heap::generation_of (gen_number);
seg = generation_start_segment (gen);
seg = heap_segment_in_range (generation_start_segment (gen));

x = heap_segment_mem (seg);
end = heap_segment_allocated (seg);
Expand All @@ -51952,12 +51952,12 @@ void gc_heap::walk_heap_per_heap (walk_fn fn, void* context, int gen_number, BOO
if (walk_large_object_heap_p)
{
walk_large_object_heap_p = FALSE;
seg = generation_start_segment (large_object_generation);
seg = heap_segment_in_range (generation_start_segment (large_object_generation));
}
else if (walk_pinned_object_heap)
{
walk_pinned_object_heap = FALSE;
seg = generation_start_segment (pinned_object_generation);
seg = heap_segment_in_range (generation_start_segment (pinned_object_generation));
}
else
{
Expand Down
16 changes: 16 additions & 0 deletions src/coreclr/vm/mono/mono_coreclr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,6 +912,22 @@ extern "C" EXPORT_API void EXPORT_CC coreclr_unity_profiler_register(const CLSID
g_profControlBlock.storedProfilers.InsertHead(profilerData);
}

extern "C" EXPORT_API ObjectHandleID EXPORT_CC coreclr_unity_profiler_get_managed_assembly_load_context(AssemblyID assemblyID)
{
STATIC_CONTRACT_NOTHROW;

Assembly *pAssembly = (Assembly*)assemblyID;
if (pAssembly == NULL)
return NULL;

AssemblyBinder* pAssemblyBinder = pAssembly->GetPEAssembly()->GetAssemblyBinder();
if (pAssemblyBinder->IsDefault())
return NULL;

// ManagedAssemblyLoadContext is a handle to the managed AssemblyLoadContext object
return (ObjectHandleID)pAssemblyBinder->GetManagedAssemblyLoadContext();
}

extern "C" EXPORT_API gboolean EXPORT_CC coreclr_unity_gc_concurrent_mode(gboolean state)
{
CONTRACTL
Expand Down
17 changes: 10 additions & 7 deletions src/coreclr/vm/threadstatics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,17 @@ void ThreadLocalBlock::FreeTLM(SIZE_T i, BOOL isThreadShuttingdown)
{
ThreadLocalModule::CollectibleDynamicEntry *entry = (ThreadLocalModule::CollectibleDynamicEntry*)pThreadLocalModule->m_pDynamicClassTable[k].m_pDynamicEntry;
PTR_LoaderAllocator pLoaderAllocator = entry->m_pLoaderAllocator;

if (entry->m_hGCStatics != NULL)
{
pLoaderAllocator->FreeHandle(entry->m_hGCStatics);
}
if (entry->m_hNonGCStatics != NULL)
// Skip assemblies that are already unloaded
if (!pLoaderAllocator->IsUnloaded())
{
pLoaderAllocator->FreeHandle(entry->m_hNonGCStatics);
if (entry->m_hGCStatics != NULL)
{
pLoaderAllocator->FreeHandle(entry->m_hGCStatics);
}
if (entry->m_hNonGCStatics != NULL)
{
pLoaderAllocator->FreeHandle(entry->m_hNonGCStatics);
}
}
}
delete pThreadLocalModule->m_pDynamicClassTable[k].m_pDynamicEntry;
Expand Down