Skip to content

Update ClrMD version #3804

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
1 commit merged into from
Apr 7, 2023
Merged

Update ClrMD version #3804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<Uri>https://github.com/dotnet/symstore</Uri>
<Sha>e09f81a0b38786cb20f66b589a8b88b6997a62da</Sha>
</Dependency>
<Dependency Name="Microsoft.Diagnostics.Runtime" Version="3.0.0-beta.23177.1">
<Dependency Name="Microsoft.Diagnostics.Runtime" Version="3.0.0-beta.23205.1">
<Uri>https://github.com/microsoft/clrmd</Uri>
<Sha>e61e6bdb23739ad2c59616b6c8d6659f4558c88d</Sha>
<Sha>3368bf4451a9441076595022fdff0f2bbea57b1b</Sha>
</Dependency>
<Dependency Name="Microsoft.Diagnostics.Runtime.Utilities" Version="3.0.0-beta.23177.1">
<Dependency Name="Microsoft.Diagnostics.Runtime.Utilities" Version="3.0.0-beta.23205.1">
<Uri>https://github.com/microsoft/clrmd</Uri>
<Sha>e61e6bdb23739ad2c59616b6c8d6659f4558c88d</Sha>
<Sha>3368bf4451a9441076595022fdff0f2bbea57b1b</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
<!-- Other libs -->
<MicrosoftBclAsyncInterfacesVersion>1.1.0</MicrosoftBclAsyncInterfacesVersion>
<MicrosoftDiagnosticsRuntimeVersion>3.0.0-beta.23177.1</MicrosoftDiagnosticsRuntimeVersion>
<MicrosoftDiagnosticsRuntimeVersion>3.0.0-beta.23205.1</MicrosoftDiagnosticsRuntimeVersion>
<MicrosoftDiaSymReaderNativePackageVersion>16.9.0-beta1.21055.5</MicrosoftDiaSymReaderNativePackageVersion>
<MicrosoftDiagnosticsTracingTraceEventVersion>3.0.7</MicrosoftDiagnosticsTracingTraceEventVersion>
<!-- Use pinned version to avoid picking up latest (which doesn't support netcoreapp3.1) during source-build -->
Expand Down
34 changes: 0 additions & 34 deletions src/Microsoft.Diagnostics.ExtensionCommands/ExtensionMethodHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,39 +37,5 @@ internal static ulong FindMostCommonPointer(this IEnumerable<ulong> enumerable)
group ptr by ptr into g
orderby g.Count() descending
select g.First()).First();

internal static Generation GetGeneration(this ClrObject obj, ClrSegment knownSegment)
{
if (knownSegment is null)
{
knownSegment = obj.Type.Heap.GetSegmentByAddress(obj);
if (knownSegment is null)
{
return Generation.Error;
}
}

if (knownSegment.Kind == GCSegmentKind.Ephemeral)
{
return knownSegment.GetGeneration(obj) switch
{
0 => Generation.Gen0,
1 => Generation.Gen1,
2 => Generation.Gen2,
_ => Generation.Error
};
}

return knownSegment.Kind switch
{
GCSegmentKind.Generation0 => Generation.Gen0,
GCSegmentKind.Generation1 => Generation.Gen1,
GCSegmentKind.Generation2 => Generation.Gen2,
GCSegmentKind.Large => Generation.Large,
GCSegmentKind.Pinned => Generation.Pinned,
GCSegmentKind.Frozen => Generation.Frozen,
_ => Generation.Error
};
}
}
}
21 changes: 15 additions & 6 deletions src/Microsoft.Diagnostics.ExtensionCommands/FindEphemeralReferencesToLOHCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ public override void Invoke()
Console.CancellationToken.ThrowIfCancellationRequested();

// This handles both regions and segments
Generation gen = obj.GetGeneration(seg);
if (gen is not Generation.Gen0 or Generation.Gen1)
Generation gen = seg.GetGeneration(obj);
if (gen is not Generation.Generation0 or Generation.Generation1)
{
continue;
}
Expand All @@ -145,8 +145,7 @@ public override void Invoke()
continue;
}

Generation refGen = objRef.GetGeneration(null);
if (refGen == Generation.Large)
if (GetGenerationWithoutSegment(objRef) == Generation.Large)
{
yield return (obj, objRef);
}
Expand Down Expand Up @@ -174,14 +173,24 @@ public override void Invoke()
continue;
}

Generation refGen = objRef.GetGeneration(null);
if (refGen is Generation.Gen0 or Generation.Gen1)
if (GetGenerationWithoutSegment(objRef) is Generation.Generation0 or Generation.Generation1)
{
yield return (obj, objRef);
}
}
}
}
}

private Generation GetGenerationWithoutSegment(ClrObject obj)
{
ClrSegment seg = Runtime.Heap.GetSegmentByAddress(obj);
if (seg is not null)
{
return seg.GetGeneration(obj);
}

return Generation.Unknown;
}
}
}
13 changes: 7 additions & 6 deletions src/Microsoft.Diagnostics.ExtensionCommands/FindReferencesToEphemeralCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ private IEnumerable<EphemeralRefCount> FindObjectsWithEphemeralReferences()
Console.CancellationToken.ThrowIfCancellationRequested();

// Skip this object if it's gen0 or we hit an error
Generation objGen = obj.GetGeneration(seg);
if (objGen is Generation.Gen0 or Generation.Error)
Generation objGen = seg.GetGeneration(obj);
if (objGen is Generation.Generation0 or Generation.Unknown)
{
continue;
}
Expand All @@ -108,10 +108,11 @@ private IEnumerable<EphemeralRefCount> FindObjectsWithEphemeralReferences()

ulong refObjSize = objRef.Size;

Generation refGen = objRef.GetGeneration(null);
ClrSegment refSeg = Runtime.Heap.GetSegmentByAddress(objRef);
Generation refGen = refSeg?.GetGeneration(objRef) ?? Generation.Unknown;
switch (refGen)
{
case Generation.Gen0:
case Generation.Generation0:
gen0 ??= new EphemeralRefCount()
{
Object = obj,
Expand All @@ -128,8 +129,8 @@ private IEnumerable<EphemeralRefCount> FindObjectsWithEphemeralReferences()

break;

case Generation.Gen1:
if (objGen > Generation.Gen1)
case Generation.Generation1:
if (objGen > Generation.Generation1)
{
gen1 ??= new EphemeralRefCount()
{
Expand Down
45 changes: 28 additions & 17 deletions src/Microsoft.Diagnostics.ExtensionCommands/GCHeapStatCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,25 +217,22 @@ private HeapInfo GetHeapInfo(ClrSubHeap heap)
continue;
}

GenerationInfo gen = seg.GetGeneration(obj) switch
GenerationInfo genInfo = result.GetInfoByGeneration(seg.GetGeneration(obj));
if (genInfo is not null)
{
0 => result.Gen0,
1 => result.Gen1,
_ => result.Gen2,
};

if (obj.IsFree)
{
result.Ephemeral.Free += obj.Size;
gen.Free += obj.Size;
}
else
{
gen.Allocated += obj.Size;

if (IncludeUnreachable && !LiveObjects.IsLive(obj))
if (obj.IsFree)
{
result.Ephemeral.Free += obj.Size;
genInfo.Free += obj.Size;
}
else
{
gen.Unrooted += obj.Size;
genInfo.Allocated += obj.Size;

if (IncludeUnreachable && !LiveObjects.IsLive(obj))
{
genInfo.Unrooted += obj.Size;
}
}
}
}
Expand Down Expand Up @@ -307,6 +304,20 @@ private sealed class HeapInfo
Frozen = left.Frozen + right.Frozen,
};
}

public GenerationInfo GetInfoByGeneration(Generation gen)
{
return gen switch
{
Generation.Generation0 => Gen0,
Generation.Generation1 => Gen1,
Generation.Generation2 => Gen2,
Generation.Large => LoH,
Generation.Pinned => PoH,
Generation.Frozen => Frozen,
_ => null
};
}
}

private sealed class GenerationInfo
Expand Down
24 changes: 10 additions & 14 deletions src/Microsoft.Diagnostics.ExtensionCommands/GCWhereCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,22 +54,18 @@ public override void Invoke()
{
generation = "reserve";
}
else if (segment.Kind == GCSegmentKind.Frozen)
{
generation = "frozen";
}
else if (segment.Kind == GCSegmentKind.Pinned)
{
generation = "pinned";
}
else if (segment.Kind == GCSegmentKind.Large)
{
generation = "large";
}
else
{
int gen = segment.GetGeneration(address);
generation = gen != -1 ? gen.ToString() : "???";
generation = segment.GetGeneration(address) switch
{
Generation.Generation0 => "0",
Generation.Generation1 => "1",
Generation.Generation2 => "2",
Generation.Frozen => "frozen",
Generation.Pinned => "pinned",
Generation.Large => "large",
_ => "???",
};
}

object addressColumn = segment.ObjectRange.Contains(address) ? new DmlListNearObj(address) : address;
Expand Down
16 changes: 0 additions & 16 deletions src/Microsoft.Diagnostics.ExtensionCommands/Generation.cs
View file
Open in desktop

This file was deleted.

22 changes: 11 additions & 11 deletions src/Microsoft.Diagnostics.ExtensionCommands/SizeStatsCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ public sealed class SizeStatsCommand : CommandBase

public override void Invoke()
{
SizeStats(Generation.Gen0, isFree: false);
SizeStats(Generation.Gen1, isFree: false);
SizeStats(Generation.Gen2, isFree: false);
SizeStats(Generation.Generation0, isFree: false);
SizeStats(Generation.Generation1, isFree: false);
SizeStats(Generation.Generation2, isFree: false);
SizeStats(Generation.Large, isFree: false);

bool hasPinned = Runtime.Heap.Segments.Any(seg => seg.Kind == GCSegmentKind.Pinned);
Expand All @@ -32,9 +32,9 @@ public override void Invoke()
SizeStats(Generation.Frozen, isFree: false);
}

SizeStats(Generation.Gen0, isFree: true);
SizeStats(Generation.Gen1, isFree: true);
SizeStats(Generation.Gen2, isFree: true);
SizeStats(Generation.Generation0, isFree: true);
SizeStats(Generation.Generation1, isFree: true);
SizeStats(Generation.Generation2, isFree: true);
SizeStats(Generation.Large, isFree: true);

if (hasPinned)
Expand Down Expand Up @@ -62,7 +62,7 @@ private void SizeStats(Generation requestedGen, bool isFree)
// If Kind == Ephemeral, we have to further filter by object generation
if (seg.Kind == GCSegmentKind.Ephemeral)
{
if (obj.GetGeneration(seg) != requestedGen)
if (seg.GetGeneration(obj) != requestedGen)
{
continue;
}
Expand Down Expand Up @@ -104,10 +104,10 @@ private static bool FilterByGeneration(ClrSegment seg, Generation gen)
{
return seg.Kind switch
{
GCSegmentKind.Ephemeral => gen <= Generation.Gen2,
GCSegmentKind.Generation0 => gen == Generation.Gen0,
GCSegmentKind.Generation1 => gen == Generation.Gen1,
GCSegmentKind.Generation2 => gen == Generation.Gen2,
GCSegmentKind.Ephemeral => gen <= Generation.Generation2,
GCSegmentKind.Generation0 => gen == Generation.Generation0,
GCSegmentKind.Generation1 => gen == Generation.Generation1,
GCSegmentKind.Generation2 => gen == Generation.Generation2,
GCSegmentKind.Frozen => gen == Generation.Frozen,
GCSegmentKind.Pinned => gen == Generation.Pinned,
GCSegmentKind.Large => gen == Generation.Large,
Expand Down