Skip to content

Split up loader heap implementations #114246

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
merged 19 commits into from
Apr 12, 2025
Merged

Split up loader heap implementations #114246

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6d51df4
Split explicit control heap from normal loader heaps
davidwrighton Dec 11, 2023
a4d4dad
Finish splitting up loader heap code
davidwrighton Dec 11, 2023
f8962a0
More splitting up of LoaderHeap and ExplicitControlLoaderHeap
davidwrighton Dec 11, 2023
08d4d3b
Break LoaderHeap codebase into multiple files
davidwrighton Jan 26, 2024
2ae1527
Merge branch 'main' of github.com:dotnet/runtime into split_up_loader…
davidwrighton Apr 1, 2025
15d776a
Follow change from merge
davidwrighton Apr 1, 2025
332d992
Current Progress
davidwrighton Apr 2, 2025
e2c216a
It builds now
davidwrighton Apr 2, 2025
a362f38
Removed unnecessary ExplicitControlLoaderHeapBlock concept
davidwrighton Apr 2, 2025
d00bb82
Move to having the right set of methods in the various files. Notably…
davidwrighton Apr 3, 2025
5165ea5
Move field initialization up into the base classes as much as possible
davidwrighton Apr 3, 2025
cdb66ef
Change stub allocation api from AllocAlignedMem to AllocStub
davidwrighton Apr 3, 2025
1631405
Move all of the shared code back into LoaderHeap.cpp where its not sh…
davidwrighton Apr 3, 2025
1647326
Merge branch 'main' of github.com:dotnet/runtime into split_up_loader…
davidwrighton Apr 3, 2025
d53ed49
Fix build breaks
davidwrighton Apr 4, 2025
cf91d74
Update comments and fix at least 1 of the musl build breaks
davidwrighton Apr 7, 2025
14df448
Address feedback
davidwrighton Apr 9, 2025
fbba5a0
Update src/coreclr/vm/loaderallocator.hpp
davidwrighton Apr 11, 2025
a0a4cdc
Remove nothion of non-released blocks from the InterleavedLoaderHeap
davidwrighton Apr 11, 2025
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
5 changes: 3 additions & 2 deletions src/coreclr/debug/daccess/request.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3554,6 +3554,7 @@ static HRESULT TraverseLoaderHeapBlock(PTR_LoaderHeapBlock firstBlock, VISITHEAP
return i < iterationMax ? S_OK : S_FALSE;
}


HRESULT
ClrDataAccess::TraverseLoaderHeap(CLRDATA_ADDRESS loaderHeapAddr, VISITHEAP pFunc)
{
Expand All @@ -3562,7 +3563,7 @@ ClrDataAccess::TraverseLoaderHeap(CLRDATA_ADDRESS loaderHeapAddr, VISITHEAP pFun

SOSDacEnter();

hr = TraverseLoaderHeapBlock(PTR_LoaderHeap(TO_TADDR(loaderHeapAddr))->m_pFirstBlock, pFunc);
hr = TraverseLoaderHeapBlock(PTR_UnlockedLoaderHeapBase(TO_TADDR(loaderHeapAddr))->m_pFirstBlock, pFunc);

SOSDacLeave();
return hr;
Expand All @@ -3581,7 +3582,7 @@ ClrDataAccess::TraverseLoaderHeap(CLRDATA_ADDRESS loaderHeapAddr, LoaderHeapKind
switch (kind)
{
case LoaderHeapKindNormal:
hr = TraverseLoaderHeapBlock(PTR_LoaderHeap(TO_TADDR(loaderHeapAddr))->m_pFirstBlock, pCallback);
hr = TraverseLoaderHeapBlock(PTR_UnlockedLoaderHeapBase(TO_TADDR(loaderHeapAddr))->m_pFirstBlock, pCallback);
break;

case LoaderHeapKindExplicitControl:
Expand Down
Loading
Loading