[cDAC] Changing loader heaps from string-keyed to enum-keyed dict#127474
Open
rcj1 wants to merge 1 commit intodotnet:mainfrom
Open
[cDAC] Changing loader heaps from string-keyed to enum-keyed dict#127474rcj1 wants to merge 1 commit intodotnet:mainfrom
rcj1 wants to merge 1 commit intodotnet:mainfrom
Conversation
Contributor
|
Tagging subscribers to this area: @steveisok, @tommcdon, @dotnet/dotnet-diag |
Comment on lines
+47
to
+59
| public enum LoaderAllocatorHeapType : uint | ||
| { | ||
| LowFrequency = 0, | ||
| HighFrequency = 1, | ||
| Statics = 2, | ||
| Stub = 3, | ||
| Executable = 4, | ||
| FixupPrecode = 5, | ||
| NewStubPrecode = 6, | ||
| DynamicHelpers = 7, | ||
| Indcell = 8, | ||
| CacheEntry = 9, | ||
| } |
Member
There was a problem hiding this comment.
Any reason to explicitly define the size of this enum and values? The flags above do, but given this is a true managed enum, I don't think we need to.
|
|
||
| public enum LoaderAllocatorHeapType : uint | ||
| { | ||
| LowFrequency = 0, |
Member
There was a problem hiding this comment.
Maybe reserve 0 for an Unknown type in case there is something added in the future?
| { | ||
| for (int i = 0; i < loaderHeapCount; i++) | ||
| int i = 0; | ||
| foreach (LoaderAllocatorHeapType heapType in Enum.GetValues<LoaderAllocatorHeapType>()) |
Member
There was a problem hiding this comment.
Contributor
Author
There was a problem hiding this comment.
So we'd have something like heaps.TryGetValue(GetEnumForFilteredEntry(filteredEntries[i].Name)?
Comment on lines
+296
to
+310
| ClrDataAddress* heaps = stackalloc ClrDataAddress[MockHeapDictionary.Count]; | ||
| int* kinds = stackalloc int[MockHeapDictionary.Count]; | ||
| int hr = impl.GetLoaderAllocatorHeaps(new ClrDataAddress(0x100), MockHeapDictionary.Count, heaps, kinds, &needed); | ||
|
|
||
| Assert.Equal(HResults.S_OK, hr); | ||
| Assert.Equal(MockHeapDictionary.Count, needed); | ||
| for (int i = 0; i < needed; i++) | ||
| int i = 0; | ||
| foreach (LoaderAllocatorHeapType heapType in Enum.GetValues<LoaderAllocatorHeapType>()) | ||
| { | ||
| string name = Marshal.PtrToStringAnsi((nint)names[i])!; | ||
| Assert.Equal((ulong)MockHeapDictionary[name], (ulong)heaps[i]); | ||
| Assert.Equal(0, kinds[i]); // LoaderHeapKindNormal | ||
| if (MockHeapDictionary.TryGetValue(heapType, out TargetPointer expected)) | ||
| { | ||
| Assert.Equal((ulong)expected, (ulong)heaps[i]); | ||
| Assert.Equal(0, kinds[i]); // LoaderHeapKindNormal | ||
| i++; | ||
| } |
Member
There was a problem hiding this comment.
Please revert this unit test. We should verify that it matches the heap names, not the enum.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow-up to #127296 (comment)