Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,7 @@

namespace Microsoft.Diagnostics.DataContractReader.Contracts;

public readonly struct ModuleHandle
{
public ModuleHandle(TargetPointer address)
{
Address = address;
}

public TargetPointer Address { get; }
}
public readonly record struct ModuleHandle(TargetPointer Address);

[Flags]
public enum ModuleFlags
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,20 @@ namespace Microsoft.Diagnostics.DataContractReader.Contracts;

internal sealed class EcmaMetadata_1(Target target) : IEcmaMetadata
{
private Dictionary<ModuleHandle, MetadataReaderProvider?> _metadata = new();
private readonly Dictionary<ModuleHandle, MetadataReaderProvider?> _metadata = [];
private readonly Dictionary<ModuleHandle, TargetSpan> _readOnlyMetadataAddress = [];

public void Flush()
{
_metadata.Clear();
_readOnlyMetadataAddress.Clear();
}

public TargetSpan GetReadOnlyMetadataAddress(ModuleHandle handle)
{
if (_readOnlyMetadataAddress.TryGetValue(handle, out TargetSpan cached))
return cached;

ILoader loader = target.Contracts.Loader;

if (!loader.TryGetLoadedImageContents(handle, out TargetPointer baseAddress, out uint size, out uint imageFlags))
Expand All @@ -32,12 +37,14 @@ public TargetSpan GetReadOnlyMetadataAddress(ModuleHandle handle)
PEStreamOptions isLoaded = isMapped ? PEStreamOptions.IsLoadedImage : PEStreamOptions.Default;

TargetStream stream = new(target, baseAddress, size);
using PEReader peReader = new PEReader(stream, PEStreamOptions.PrefetchMetadata | isLoaded);
using PEReader peReader = new PEReader(stream, isLoaded);

int metadataStartOffset = peReader.PEHeaders.MetadataStartOffset;
int metadataSize = peReader.PEHeaders.MetadataSize;

return new TargetSpan(baseAddress + (ulong)metadataStartOffset, (ulong)metadataSize);
TargetSpan result = new TargetSpan(baseAddress + (ulong)metadataStartOffset, (ulong)metadataSize);
_readOnlyMetadataAddress[handle] = result;
return result;
}

public MetadataReader? GetMetadata(ModuleHandle handle)
Expand Down
Loading