From: Sung Yoon Whang Date: Sun, 2 Jun 2019 23:17:51 +0000 (-0700) Subject: Display unknown EventSource's provider name properly (#299) X-Git-Tag: submit/tizen/20190813.035844~6^2^2~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b94de40bd1b73304bb16bc868829cb1ef6bea80;p=platform%2Fcore%2Fdotnet%2Fdiagnostics.git Display unknown EventSource's provider name properly (#299) --- diff --git a/src/Tools/dotnet-counters/ConsoleWriter.cs b/src/Tools/dotnet-counters/ConsoleWriter.cs index 1886dfd08..b681dec56 100644 --- a/src/Tools/dotnet-counters/ConsoleWriter.cs +++ b/src/Tools/dotnet-counters/ConsoleWriter.cs @@ -16,11 +16,13 @@ namespace Microsoft.Diagnostics.Tools.Counters private int maxRow; // Running maximum of row number private int maxCol; // Running maximum of col number private Dictionary knownProvidersRowNum; + private Dictionary unknownProvidersRowNum; public ConsoleWriter() { displayPosition = new Dictionary(); knownProvidersRowNum = new Dictionary(); + unknownProvidersRowNum = new Dictionary(); foreach(CounterProvider provider in KnownData.GetAllProviders()) { @@ -64,7 +66,7 @@ namespace Microsoft.Diagnostics.Tools.Counters { knownProvidersRowNum[providerName] = maxRow + 1; Console.SetCursorPosition(0, maxRow); - Console.WriteLine(providerName); + Console.WriteLine($"[{providerName}]"); maxRow += 1; } @@ -84,6 +86,14 @@ namespace Microsoft.Diagnostics.Tools.Counters else { // If it's from an unknown provider, just append it at the end. + if (!unknownProvidersRowNum.ContainsKey(providerName)) + { + knownProvidersRowNum[providerName] = maxRow + 1; + Console.SetCursorPosition(0, maxRow); + Console.WriteLine($"[{providerName}]"); + maxRow += 1; + } + string displayName = payload.GetDisplay(); if (string.IsNullOrEmpty(displayName)) { diff --git a/src/Tools/dotnet-counters/CounterMonitor.cs b/src/Tools/dotnet-counters/CounterMonitor.cs index c57f1936e..ed129d1d1 100644 --- a/src/Tools/dotnet-counters/CounterMonitor.cs +++ b/src/Tools/dotnet-counters/CounterMonitor.cs @@ -101,11 +101,6 @@ namespace Microsoft.Diagnostics.Tools.Counters return 1; } - if (_interval == 0) { - _console.Error.WriteLine("refreshInterval is required."); - return 1; - } - String providerString; if (_counterList.Count == 0)