Basic changes to match defined code style. (#3029)

Author: cincuranet

src/tools/Reporting/Reporting/Reporter.cs

@@ -59,7 +59,7 @@ private void Init()
                 Queue = environment.GetEnvironmentVariable("PERFLAB_QUEUE"),
                 WorkItemName = environment.GetEnvironmentVariable("HELIX_WORKITEM_FRIENDLYNAME"),
             };
-            Boolean.TryParse(environment.GetEnvironmentVariable("PERFLAB_HIDDEN"), out bool hidden);
+            Boolean.TryParse(environment.GetEnvironmentVariable("PERFLAB_HIDDEN"), out var hidden);
             run.Hidden = hidden;
             var configs = environment.GetEnvironmentVariable("PERFLAB_CONFIGS");
             if (!String.IsNullOrEmpty(configs)) // configs should be optional.
@@ -135,7 +135,7 @@ public string GetJson()
 
         public string WriteResultTable()
         {
-            StringBuilder ret = new StringBuilder();
+            var ret = new StringBuilder();
             foreach (var test in tests)
             {
                 var defaultCounter = test.Counters.Single(c => c.DefaultCounter);
@@ -162,9 +162,9 @@ public string WriteResultTable()
         }
         private string Print(Counter counter, int counterWidth, int resultWidth)
         {
-            string average = $"{counter.Results.Average():F3} {counter.MetricName}";
-            string max = $"{counter.Results.Max():F3} {counter.MetricName}";
-            string min = $"{counter.Results.Min():F3} {counter.MetricName}";
+            var average = $"{counter.Results.Average():F3} {counter.MetricName}";
+            var max = $"{counter.Results.Max():F3} {counter.MetricName}";
+            var min = $"{counter.Results.Min():F3} {counter.MetricName}";
             return $"{LeftJustify(counter.Name, counterWidth)}|{LeftJustify(average, resultWidth)}|{LeftJustify(min, resultWidth)}|{LeftJustify(max, resultWidth)}";
         }
 

src/tools/ScenarioMeasurement/SizeOnDisk/MStatProcessor.cs

@@ -55,11 +55,11 @@ static List<Result> GetBlobStats(TypeDefinition globalType)
         sealed record TypeStats(TypeReference Type, int Size);
         static IEnumerable<TypeStats> GetTypes(Version version, MethodDefinition types)
         {
-            int entrySize = version.Major == 1 ? 2 : 3;
+            var entrySize = version.Major == 1 ? 2 : 3;
 
             types.Body.SimplifyMacros();
             var il = types.Body.Instructions;
-            for (int i = 0; i + entrySize < il.Count; i += entrySize)
+            for (var i = 0; i + entrySize < il.Count; i += entrySize)
             {
                 var type = (TypeReference)il[i + 0].Operand;
                 var size = (int)il[i + 1].Operand;
@@ -70,11 +70,11 @@ static IEnumerable<TypeStats> GetTypes(Version version, MethodDefinition types)
         sealed record MethodStats(MethodReference Method, int Size, int GcInfoSize, int EhInfoSize);
         static IEnumerable<MethodStats> GetMethods(Version version, MethodDefinition methods)
         {
-            int entrySize = version.Major == 1 ? 4 : 5;
+            var entrySize = version.Major == 1 ? 4 : 5;
 
             methods.Body.SimplifyMacros();
             var il = methods.Body.Instructions;
-            for (int i = 0; i + entrySize < il.Count; i += entrySize)
+            for (var i = 0; i + entrySize < il.Count; i += entrySize)
             {
                 var method = (MethodReference)il[i + 0].Operand;
                 var size = (int)il[i + 1].Operand;
@@ -88,7 +88,7 @@ static IEnumerable<Result> GetBlobs(MethodDefinition blobs)
         {
             blobs.Body.SimplifyMacros();
             var il = blobs.Body.Instructions;
-            for (int i = 0; i + 2 < il.Count; i += 2)
+            for (var i = 0; i + 2 < il.Count; i += 2)
             {
                 var name = (string)il[i + 0].Operand;
                 var size = (int)il[i + 1].Operand;

src/tools/ScenarioMeasurement/SizeOnDisk/SizeOnDisk.cs

@@ -40,8 +40,8 @@ static int Main(string scenarioName,
 
             var counters = new List<Counter>();
             long totalSize = 0;
-            int totalCount = 0;
-            bool directoryIsTop = dirs.Length > 1; // if we were asked to log more than one directory, include the summary info as top counters.
+            var totalCount = 0;
+            var directoryIsTop = dirs.Length > 1; // if we were asked to log more than one directory, include the summary info as top counters.
             var buckets = new Dictionary<string, (long size, int count, bool isTop)>();
             foreach (var directory in directories)
             {

src/tools/ScenarioMeasurement/Startup.Tests/StartupTests.cs

@@ -19,8 +19,8 @@ public class StartupTests
         [WindowsOnly]
         public void TestWindowsTraceSession()
         {
-            string sessionName = "test-windows-session";
-            string traceName = "test-windows-trace";
+            var sessionName = "test-windows-session";
+            var traceName = "test-windows-trace";
             var session = new WindowsTraceSession(sessionName, traceName, traceDirectory, logger);
             var parser = new TimeToMainParser();
             TestSession(session, parser);
@@ -29,8 +29,8 @@ public void TestWindowsTraceSession()
         [LinuxOnly]
         public void TestLinuxTraceSession()
         {
-            string sessionName = "test-linux-session";
-            string traceName = "test-linux-trace";
+            var sessionName = "test-linux-session";
+            var traceName = "test-linux-trace";
             var session = new LinuxTraceSession(sessionName, traceName, traceDirectory, logger);
             var parser = new TimeToMainParser();
             TestSession(session, parser);
@@ -39,8 +39,8 @@ public void TestLinuxTraceSession()
         [WindowsOnly(Skip = "Skipping test until asset is provided")]
         public void TestProfileIteration()
         {
-            string sessionName = "test-profile-iteration-session";
-            string traceName = "test-profile-iteration-trace";
+            var sessionName = "test-profile-iteration-session";
+            var traceName = "test-profile-iteration-trace";
             var timeToMainParser = new TimeToMainParser();
             var profileParser = new ProfileParser(timeToMainParser);
             var profileSession = TraceSessionManager.CreateSession(sessionName, traceName, traceDirectory, logger);
@@ -50,11 +50,11 @@ public void TestProfileIteration()
         [Fact(Skip = "Skipping test until asset is provided")]
         public void TestProcessTimeParserLinux()
         {
-            string ctfFile = Path.Combine(testAssetDirectory, "test-process-time_startup.trace.zip");
+            var ctfFile = Path.Combine(testAssetDirectory, "test-process-time_startup.trace.zip");
             var parser = new ProcessTimeParser();
             var pids = new List<int>() { 18627, 18674, 18721, 18768, 18813 };
-            IEnumerable<Counter> counters = parser.Parse(ctfFile, "dotnet", pids, "\"dotnet\" build");
-            int count = 0;
+            var counters = parser.Parse(ctfFile, "dotnet", pids, "\"dotnet\" build");
+            var count = 0;
             foreach (var counter in counters)
             {
                 Assert.True(counter.Results.Count == pids.Count, $"Counter {counter.Name} is expected to have {pids.Count} results.");
@@ -66,11 +66,11 @@ public void TestProcessTimeParserLinux()
         [Fact(Skip = "Skipping test until asset is provided")]
         public void TestProcessTimeParserWindows()
         {
-            string etlFile = Path.Combine(testAssetDirectory, "test-process-time_startup.etl");
+            var etlFile = Path.Combine(testAssetDirectory, "test-process-time_startup.etl");
             var parser = new ProcessTimeParser();
             var pids = new List<int>() { 32752, 6352, 16876, 10500, 17784 };
-            IEnumerable<Counter> counters = parser.Parse(etlFile, "dotnet", pids, "\"dotnet\" build");
-            int count = 0;
+            var counters = parser.Parse(etlFile, "dotnet", pids, "\"dotnet\" build");
+            var count = 0;
             foreach (var counter in counters)
             {
                 Assert.True(counter.Results.Count == pids.Count, $"Counter {counter.Name} is expected to have {pids.Count} results.");
@@ -82,11 +82,11 @@ public void TestProcessTimeParserWindows()
         [Fact(Skip = "Skipping test until asset is provided")]
         public void TestTimeToMainParserLinux()
         {
-            string ctfFile = Path.Combine(testAssetDirectory, "test-time-to-main_startup.trace.zip");
+            var ctfFile = Path.Combine(testAssetDirectory, "test-time-to-main_startup.trace.zip");
             var parser = new TimeToMainParser();
             var pids = new List<int>() { 24352, 24362, 24371, 24380, 24389 };
-            IEnumerable<Counter> counters = parser.Parse(ctfFile, "emptycsconsoletemplate", pids, "\"pub\\emptycsconsoletemplate.exe\"");
-            int count = 0;
+            var counters = parser.Parse(ctfFile, "emptycsconsoletemplate", pids, "\"pub\\emptycsconsoletemplate.exe\"");
+            var count = 0;
             foreach (var counter in counters)
             {
                 Assert.True(counter.Results.Count == pids.Count, $"Counter {counter.Name} is expected to have {pids.Count} results.");
@@ -99,11 +99,11 @@ public void TestTimeToMainParserLinux()
         [Fact(Skip = "Skipping test until asset is provided")]
         public void TestTimeToMainParserWindows()
         {
-            string etlFile = Path.Combine(testAssetDirectory, "test-time-to-main_startup.etl");
+            var etlFile = Path.Combine(testAssetDirectory, "test-time-to-main_startup.etl");
             var parser = new TimeToMainParser();
             var pids = new List<int>() { 17036, 21640, 12912, 19764, 11624 };
-            IEnumerable<Counter> counters = parser.Parse(etlFile, "emptycsconsoletemplate", pids, "\"pub\\emptycsconsoletemplate.exe\"");
-            int count = 0;
+            var counters = parser.Parse(etlFile, "emptycsconsoletemplate", pids, "\"pub\\emptycsconsoletemplate.exe\"");
+            var count = 0;
             foreach (var counter in counters)
             {
                 Assert.True(counter.Results.Count == pids.Count, $"Counter {counter.Name} is expected to have {pids.Count} results.");
@@ -115,7 +115,7 @@ public void TestTimeToMainParserWindows()
 
         private void TestSession(ITraceSession session, IParser parser)
         {
-            string traceFilePath = "";
+            var traceFilePath = "";
             using (session)
             {
                 session.EnableProviders(parser);

src/tools/ScenarioMeasurement/Startup/Crossgen2Parser.cs

@@ -167,11 +167,11 @@ private void ParseStopEvent(TraceEvent evt, TraceSourceManager source)
             // time elapsed between each pair as the interval of this event. 
 
             // Get time elapsed for this pair of start&stop events
-            double interval = evt.TimeStampRelativeMSec - Start;
+            var interval = evt.TimeStampRelativeMSec - Start;
             // If previous pid exists, this is the same process and time elapsed is added to the last value in the stack.
             if (PrevPid.HasValue && evt.ProcessID == PrevPid)
             {
-                double lastValue = Intervals.Pop();
+                var lastValue = Intervals.Pop();
                 Intervals.Push(lastValue + interval);
             }
             // If previous pid doesn't exist, this is the next process and time elapsed is a new value pushed to the stack.

src/tools/ScenarioMeasurement/Startup/DeviceTimeToMain.cs

@@ -28,18 +28,18 @@ public void EnableUserProviders(ITraceSession user)
         public IEnumerable<Counter> Parse(string mergeTraceFile, string processName, IList<int> pids, string commandLine)
         {
             var times = new List<double>();
-            Regex totalTimePattern = new Regex(@"TotalTime:\s(?<totalTime>.+)");
+            var totalTimePattern = new Regex(@"TotalTime:\s(?<totalTime>.+)");
 
             if (File.Exists(mergeTraceFile))
             {
-                using(StreamReader sr = new StreamReader(mergeTraceFile))
+                using(var sr = new StreamReader(mergeTraceFile))
                 {
-                    string line = sr.ReadToEnd();
-                    MatchCollection finds = totalTimePattern.Matches(line);
+                    var line = sr.ReadToEnd();
+                    var finds = totalTimePattern.Matches(line);
                     Console.WriteLine($"Found Startup Times: {finds.Count}");
                     foreach (Match match in finds)
                     {
-                        GroupCollection groups = match.Groups;
+                        var groups = match.Groups;
                         Console.WriteLine($"Found Value (ms): {groups["totalTime"].Value}");
                         times.Add(Double.Parse(groups["totalTime"].Value));
                     }

src/tools/ScenarioMeasurement/Startup/DotnetWatchParser.cs

@@ -31,7 +31,7 @@ public IEnumerable<Counter> Parse(string mergeTraceFile, string processName, ILi
             var ins = new Dictionary<int, double>();
             double start = -1;
             int? pid = null;
-            bool firstHotReload = true;
+            var firstHotReload = true;
             using (var source = new TraceSourceManager(mergeTraceFile))
             {
 

src/tools/ScenarioMeasurement/Startup/InnerLoopMsBuildParser.cs

@@ -29,9 +29,9 @@ public IEnumerable<Counter> Parse(string mergeTraceFile, string processName, ILi
             double start = -1;
             double buildEvalStart = -1;
             int? pid = null;
-            Dictionary<string, List<double>> firstRun = new Dictionary<string, List<double>>();
-            Dictionary<string, List<double>> secondRun = new Dictionary<string, List<double>>();
-            Dictionary<string, List<double>> currentRun = firstRun;
+            var firstRun = new Dictionary<string, List<double>>();
+            var secondRun = new Dictionary<string, List<double>>();
+            var currentRun = firstRun;
             using (var source = new TraceSourceManager(mergeTraceFile))
             {
 
@@ -141,19 +141,19 @@ public IEnumerable<Counter> Parse(string mergeTraceFile, string processName, ILi
                 source.Process();
             }
 
-            List<double> diffGS = new List<double>();
-            List<double> diffTOT = new List<double>();
-            List<double> diffEBT = new List<double>();
+            var diffGS = new List<double>();
+            var diffTOT = new List<double>();
+            var diffEBT = new List<double>();
 
-            for(int i = 0; i < firstRun["Process/Stop"].Count; i++)
+            for(var i = 0; i < firstRun["Process/Stop"].Count; i++)
             {
                 diffGS.Add(firstRun["Process/Stop"][i] - secondRun["Process/Stop"][i]);
             }
-            for(int i = 0; i < firstRun["ThreadCSwitch"].Count; i++)
+            for(var i = 0; i < firstRun["ThreadCSwitch"].Count; i++)
             {
                 diffTOT.Add(firstRun["ThreadCSwitch"][i] - secondRun["ThreadCSwitch"][i]);
             }
-            for(int i = 0; i < firstRun["Evaluate/Stop"].Count; i++)
+            for(var i = 0; i < firstRun["Evaluate/Stop"].Count; i++)
             {
                 diffEBT.Add(firstRun["Evaluate/Stop"][i] - secondRun["Evaluate/Stop"][i]);
             }

src/tools/ScenarioMeasurement/Startup/InnerLoopParser.cs

@@ -40,8 +40,8 @@ public IEnumerable<Counter> Parse(string mergeTraceFile, string processName, ILi
             var ins = new Dictionary<int, double>();
             double start = -1;
             int? pid = null;
-            List<List<double>> firstRun = new List<List<double>>();
-            List<List<double>> secondRun = new List<List<double>>();
+            var firstRun = new List<List<double>>();
+            var secondRun = new List<List<double>>();
             using (var source = new TraceSourceManager(mergeTraceFile))
             {
 
@@ -146,13 +146,13 @@ public IEnumerable<Counter> Parse(string mergeTraceFile, string processName, ILi
                 source.Process();
             }
 
-            List<double> diffGS = new List<double>();
-            List<double> diffTOT = new List<double>();
-            for(int i = 0; i < firstRun[0].Count; i++)
+            var diffGS = new List<double>();
+            var diffTOT = new List<double>();
+            for(var i = 0; i < firstRun[0].Count; i++)
             {
                 diffGS.Add(firstRun[0][i] - secondRun[0][i]);
             }
-            for(int i = 0; i < firstRun[1].Count; i++)
+            for(var i = 0; i < firstRun[1].Count; i++)
             {
                 diffTOT.Add(firstRun[1][i] - secondRun[1][i]);
             }

src/tools/ScenarioMeasurement/Startup/PDNStartupParser.cs

@@ -43,8 +43,8 @@ public IEnumerable<Counter> Parse(string mergeTraceFile, string processName, ILi
 
                 source.Kernel.ProcessStart += evt =>
                 {
-                    string commandLineArgs = commandLine.Substring(commandLine.LastIndexOf("\"")+1).Trim();
-                    string payloadCommandLineArgs = evt.CommandLine.Substring(evt.CommandLine.LastIndexOf("\"")+1).Trim();
+                    var commandLineArgs = commandLine.Substring(commandLine.LastIndexOf("\"")+1).Trim();
+                    var payloadCommandLineArgs = evt.CommandLine.Substring(evt.CommandLine.LastIndexOf("\"")+1).Trim();
                     if (processName.Equals(evt.ProcessName, StringComparison.OrdinalIgnoreCase) && pids.Contains(evt.ProcessID) && payloadCommandLineArgs == commandLineArgs)
                     {
                         if (pid.HasValue)