Skip to content

Add maddress -orderBySize #3803

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 5, 2023
Merged

Add maddress -orderBySize #3803

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
25 changes: 17 additions & 8 deletions src/Microsoft.Diagnostics.ExtensionCommands/MAddressCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public sealed class MAddressCommand : CommandBase
private const string ReserveHeuristicFlag = "-reserveHeuristic";
private const string ForceHandleTableFlag = "-forceHandleTable";
private const string ListFlag = "-list";
private const string BySizeFlag = "-orderBySize";

[Option(Name = SummaryFlag, Aliases = new string[] { "-stat", }, Help = "Only print summary table.")]
public bool Summary { get; set; }
Expand All @@ -34,7 +35,10 @@ public sealed class MAddressCommand : CommandBase
[Option(Name = ForceHandleTableFlag, Help = "We only tag the HandleTable if we can do so efficiently on newer runtimes. This option ensures we always tag HandleTable memory, even if it will take a long time.")]
public bool IncludeHandleTableIfSlow { get; set; }

[Option(Name = ListFlag, Help = "A separated list of regions to list allocations for.")]
[Option(Name = BySizeFlag, Help = "List the raw addresses by size, not by base address.")]
public bool BySize { get; set; }

[Option(Name = ListFlag, Help = "A separated list of memory regions to list allocations for.")]
public string List { get; set; }

[ServiceImport]
Expand Down Expand Up @@ -76,7 +80,8 @@ public override void Invoke()
};

output.WriteRowWithSpacing('-', "Memory Kind", "StartAddr", "EndAddr-1", "Size", "Type", "State", "Protect", "Image");
foreach (DescribedRegion mem in ranges)
IOrderedEnumerable<DescribedRegion> ordered = BySize ? ranges.OrderByDescending(r => r.Size).ThenBy(r => r.Start) : ranges.OrderBy(r => r.Start);
foreach (DescribedRegion mem in ordered)
{
Console.CancellationToken.ThrowIfCancellationRequested();

Expand Down Expand Up @@ -105,7 +110,7 @@ orderby Size descending
Divider = " | "
};

output.WriteRowWithSpacing('-', "Image", "Regions", "Size", "Size (bytes)");
output.WriteRowWithSpacing('-', "Image", "Count", "Size", "Size (bytes)");

int count = 0;
long size = 0;
Expand All @@ -126,7 +131,7 @@ orderby Size descending

if (List is not null)
{
// Print a list of the specified memory regions, ordered by size descending.
// Print a list of the specified memory kind, ordered by size descending.

string[] requested = List.Split(new char[] { ',', ' ' }, StringSplitOptions.RemoveEmptyEntries);
foreach (string kind in requested)
Expand Down Expand Up @@ -154,7 +159,7 @@ orderby Size descending
totalSize += region.Size;
}

Console.WriteLine($"{totalSize:n0} bytes ({totalSize.ConvertToHumanReadable()}) in {count:n0} regions");
Console.WriteLine($"{totalSize:n0} bytes ({totalSize.ConvertToHumanReadable()}) in {count:n0} memory regions");
Console.WriteLine();
}
}
Expand All @@ -181,7 +186,7 @@ orderby Size descending
Divider = " | "
};

output.WriteRowWithSpacing('-', "Region Type", "Count", "Size", "Size (bytes)");
output.WriteRowWithSpacing('-', "Memory Type", "Count", "Size", "Size (bytes)");

int count = 0;
long size = 0;
Expand Down Expand Up @@ -212,7 +217,7 @@ with information about CLR's heaps.

Flags:
{SummaryFlag}
Show only a summary table of memory regions and not the list of every address region.
Show only a summary table of memory regions and not the list of every memory region.

{ImagesFlag}
Summarizes the memory ranges consumed by images in the process.
Expand All @@ -236,8 +241,12 @@ intended to be completely accurate. This can be useful to try to figure out
what is creating large amount of MEM_RESERVE regions.

{ListFlag}
A separated list of region types (as maddress defines them) to print the base
A separated list of memory region types (as maddress defines them) to print the base
addresses and sizes of. This list may be separated by , or ""in quotes"".

{BySizeFlag}
Order the list of memory blocks by size (descending) when printing the list
of all memory blocks instead of by address.
");
}
}
Expand Down