Skip to content

Fixed dotnet-counters rendering issues #3353

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
hoyosjs merged 9 commits into from
Sep 14, 2022
Merged

Fixed dotnet-counters rendering issues #3353

Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1577f73
Updated ConsolWriter formatting
dramos020 Aug 30, 2022
7de8e5b
Fixed the issue of large fonts by using the fixed length of formatted…
dramos020 Sep 1, 2022
3ecd952
Should now only print the numerical values when the window width is l…
dramos020 Sep 1, 2022
ceab27b
Truncate the instruction string at the top of output based on the con…
dramos020 Sep 2, 2022
c97259d
Updated coding style changes
dramos020 Sep 2, 2022
64129f8
Added fix for change in console height
dramos020 Sep 7, 2022
5c0b595
Added fix for change in console height and multidimensional metrics.
dramos020 Sep 8, 2022
13755a4
Added comments and fixed height checker
dramos020 Sep 9, 2022
4f59900
Changed the default value for _maxNameLength
dramos020 Sep 12, 2022
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
35 changes: 33 additions & 2 deletions src/Tools/dotnet-counters/Exporters/ConsoleWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ public ObservedTagSet(string tags)
private readonly object _lock = new object();
private readonly Dictionary<string, ObservedProvider> _providers = new Dictionary<string, ObservedProvider>(); // Tracks observed providers and counters.
private const int Indent = 4; // Counter name indent size.
private int _maxNameLength = 40; // Allow room for 40 character counter names by default.
private const int CounterValueLength = 15;

private int _maxNameLength = 60; // Allow room for 60 character counter names by default.
private int _statusRow; // Row # of where we print the status of dotnet-counters
private int _topRow;
private bool _paused = false;
Expand All @@ -69,6 +70,9 @@ public ObservedTagSet(string tags)
private int _maxRow = -1;
private bool _useAnsi = false;

private int _consoleHeight = -1;
private int _consoleWidth = -1;

public ConsoleWriter(bool useAnsi)
{
this._useAnsi = useAnsi;
Expand Down Expand Up @@ -126,9 +130,14 @@ public void AssignRowsAndInitializeDisplay()
{
Clear();

_consoleWidth = Console.WindowWidth;
_consoleHeight = Console.WindowHeight;

int row = Console.CursorTop;
_topRow = row;
Console.WriteLine("Press p to pause, r to resume, q to quit."); row++;

string instructions = "Press p to pause, r to resume, q to quit.";
Console.WriteLine((instructions.Length < _consoleWidth) ? instructions : instructions.Substring(0, _consoleWidth)); row++;
Console.WriteLine($" Status: {GetStatus()}"); _statusRow = row++;
if (_errorText != null)
{
Expand All @@ -140,22 +149,39 @@ public void AssignRowsAndInitializeDisplay()
foreach (ObservedProvider provider in _providers.Values.OrderBy(p => p.KnownProvider == null).ThenBy(p => p.Name)) // Known providers first.
{
Console.WriteLine($"[{provider.Name}]"); row++;
int rowCount = 0;

foreach (ObservedCounter counter in provider.Counters.Values.OrderBy(c => c.DisplayName))
{
if(rowCount >= _consoleHeight - 5)
Copy link
Member

@noahfalk noahfalk Sep 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this code trying to prevent us from displaying more counters than we have vertical space available? If so should it be refering to row rather than rowCount? For example I could have 100 providers and each provider has 1 counter in it which means rowCount would always be zero.

Copy link
Contributor Author

@dramos020 dramos020 Sep 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right. Made the change to reference row:

if(row >= _consoleHeight){
    break;
}

{
break;
}

_maxNameLength = Math.Max(Math.Min(80, _consoleWidth) - (CounterValueLength + Indent + 1), 0);
string name = MakeFixedWidth($"{new string(' ', Indent)}{counter.DisplayName}", Indent + _maxNameLength);
counter.Row = row++;
if (counter.RenderValueInline)
{
Console.WriteLine($"{name} {FormatValue(counter.LastValue)}");
rowCount++;
}
else
{
Console.WriteLine(name);
rowCount++;
foreach (ObservedTagSet tagSet in counter.TagSets.Values.OrderBy(t => t.Tags))
{
if(rowCount >= _consoleHeight - 5)
{
break;
}

_maxNameLength = Math.Max(Math.Min(80, _consoleWidth) - (CounterValueLength + Indent + 1), 0);
string tagName = MakeFixedWidth($"{new string(' ', 2 * Indent)}{tagSet.Tags}", Indent + _maxNameLength);
Console.WriteLine($"{tagName} {FormatValue(tagSet.LastValue)}");
tagSet.Row = row++;
rowCount++;
}
}
}
Expand Down Expand Up @@ -222,6 +248,11 @@ public void CounterPayloadReceived(CounterPayload payload, bool pauseCmdSet)
redraw = true;
}

if(Console.WindowWidth != _consoleWidth || Console.WindowHeight != _consoleHeight)
{
redraw=true;
}

if (redraw)
{
AssignRowsAndInitializeDisplay();
Expand Down