Skip to content

Commit 0cd6e3e

Browse files
authored
Update binlog path check for build time measurements (#4846)
* Fix binlog path validation for build time measurements * Convert build time metrics from milliseconds to seconds
1 parent 46a198a commit 0cd6e3e

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

src/scenarios/shared/runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,7 @@ def run(self):
969969

970970
elif self.testtype == const.BUILDTIME:
971971
startup = StartupWrapper()
972-
if not (self.binlogpath and os.path.exists(self.binlogpath)):
972+
if not (self.binlogpath and os.path.exists(os.path.join(const.TRACEDIR, self.binlogpath))):
973973
raise Exception("For build time measurements a valid binlog path must be provided.")
974974
self.traits.add_traits(overwrite=True, apptorun="app", startupmetric=const.BUILDTIME, tracename=self.binlogpath, scenarioname=self.scenarioname)
975975
startup.parsetraces(self.traits)

src/tools/ScenarioMeasurement/Util/Parsers/BuildTimeParser.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,39 +40,39 @@ public IEnumerable<Counter> Parse(string binlogFile, string processName, IList<i
4040
foreach (var task in build.FindChildrenRecursive<Task>())
4141
{
4242
var name = task.Name;
43-
var ms = task.Duration.TotalMilliseconds;
43+
var s = task.Duration.TotalMilliseconds / 1000.0;
4444

4545
if (name.Equals("ILLink", StringComparison.OrdinalIgnoreCase))
4646
{
47-
illinkTimes.Add(ms);
47+
illinkTimes.Add(s);
4848
}
4949
else if (name.Equals("MonoAOTCompiler", StringComparison.OrdinalIgnoreCase))
5050
{
51-
monoaotcompilerTimes.Add(ms);
51+
monoaotcompilerTimes.Add(s);
5252
}
5353
else if (name.Equals("AppleAppBuilderTask", StringComparison.OrdinalIgnoreCase))
5454
{
55-
appleappbuilderTimes.Add(ms);
55+
appleappbuilderTimes.Add(s);
5656
}
5757
else if (name.Equals("AndroidAppBuilderTask", StringComparison.OrdinalIgnoreCase))
5858
{
59-
androidappbuilderTimes.Add(ms);
59+
androidappbuilderTimes.Add(s);
6060
}
6161
}
6262

63-
publishTimes.Add(build.Duration.TotalMilliseconds);
63+
publishTimes.Add(build.Duration.TotalMilliseconds / 1000.0);
6464
}
6565

6666

6767
if (illinkTimes.Count > 0)
68-
yield return new Counter { Name = "ILLink Time", MetricName = "ms", DefaultCounter = false, TopCounter = true, Results = illinkTimes.ToArray() };
68+
yield return new Counter { Name = "ILLink Time", MetricName = "s", DefaultCounter = false, TopCounter = true, Results = illinkTimes.ToArray() };
6969
if (monoaotcompilerTimes.Count > 0)
70-
yield return new Counter { Name = "MonoAOTCompiler Time", MetricName = "ms", DefaultCounter = false, TopCounter = true, Results = monoaotcompilerTimes.ToArray() };
70+
yield return new Counter { Name = "MonoAOTCompiler Time", MetricName = "s", DefaultCounter = false, TopCounter = true, Results = monoaotcompilerTimes.ToArray() };
7171
if (appleappbuilderTimes.Count > 0)
72-
yield return new Counter { Name = "AppleAppBuilderTask Time", MetricName = "ms", DefaultCounter = false, TopCounter = true, Results = appleappbuilderTimes.ToArray() };
72+
yield return new Counter { Name = "AppleAppBuilderTask Time", MetricName = "s", DefaultCounter = false, TopCounter = true, Results = appleappbuilderTimes.ToArray() };
7373
if (androidappbuilderTimes.Count > 0)
74-
yield return new Counter { Name = "AndroidAppBuilderTask Time", MetricName = "ms", DefaultCounter = false, TopCounter = true, Results = androidappbuilderTimes.ToArray() };
74+
yield return new Counter { Name = "AndroidAppBuilderTask Time", MetricName = "s", DefaultCounter = false, TopCounter = true, Results = androidappbuilderTimes.ToArray() };
7575
if (publishTimes.Count > 0)
76-
yield return new Counter { Name = "Publish Time", MetricName = "ms", DefaultCounter = true, TopCounter = true, Results = publishTimes.ToArray() };
76+
yield return new Counter { Name = "Publish Time", MetricName = "s", DefaultCounter = true, TopCounter = true, Results = publishTimes.ToArray() };
7777
}
7878
}

0 commit comments

Comments
 (0)