From 4aee83abb764b83888b28868e388bd27b6b3e11e Mon Sep 17 00:00:00 2001 From: John Richardson Date: Thu, 19 May 2016 11:07:27 +0100 Subject: [PATCH] Update add_metric calls to include units for performance timings --- wlauto/workloads/gmail/__init__.py | 6 +++--- wlauto/workloads/googlephotos/__init__.py | 9 ++++++--- wlauto/workloads/reader/__init__.py | 6 +++--- wlauto/workloads/skype/__init__.py | 9 ++++++--- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/wlauto/workloads/gmail/__init__.py b/wlauto/workloads/gmail/__init__.py index 8e002e43..bd37a883 100755 --- a/wlauto/workloads/gmail/__init__.py +++ b/wlauto/workloads/gmail/__init__.py @@ -99,11 +99,11 @@ class Gmail(AndroidUiAutoBenchmark): match = regex.search(line) if match: context.result.add_metric((match.group('key') + "_start"), - match.group('value1')) + match.group('value1'), units='ms') context.result.add_metric((match.group('key') + "_finish"), - match.group('value2')) + match.group('value2'), units='ms') context.result.add_metric((match.group('key') + "_duration"), - match.group('value3')) + match.group('value3'), units='ms') def teardown(self, context): super(Gmail, self).teardown(context) diff --git a/wlauto/workloads/googlephotos/__init__.py b/wlauto/workloads/googlephotos/__init__.py index e4b91462..342a728d 100755 --- a/wlauto/workloads/googlephotos/__init__.py +++ b/wlauto/workloads/googlephotos/__init__.py @@ -100,9 +100,12 @@ class Googlephotos(AndroidUiAutoBenchmark): for line in wfh: match = regex.search(line) if match: - context.result.add_metric((match.group('key') + "_start"), match.group('value1')) - context.result.add_metric((match.group('key') + "_finish"), match.group('value2')) - context.result.add_metric((match.group('key') + "_duration"), match.group('value3')) + context.result.add_metric((match.group('key') + "_start"), + match.group('value1'), units='ms') + context.result.add_metric((match.group('key') + "_finish"), + match.group('value2'), units='ms') + context.result.add_metric((match.group('key') + "_duration"), + match.group('value3'), units='ms') def teardown(self, context): super(Googlephotos, self).teardown(context) diff --git a/wlauto/workloads/reader/__init__.py b/wlauto/workloads/reader/__init__.py index c53f7be8..1eb6c929 100755 --- a/wlauto/workloads/reader/__init__.py +++ b/wlauto/workloads/reader/__init__.py @@ -100,11 +100,11 @@ class Reader(AndroidUiAutoBenchmark): match = regex.search(line) if match: context.result.add_metric((match.group('key') + "_start"), - match.group('value1')) + match.group('value1'), units='ms') context.result.add_metric((match.group('key') + "_finish"), - match.group('value2')) + match.group('value2'), units='ms') context.result.add_metric((match.group('key') + "_duration"), - match.group('value3')) + match.group('value3'), units='ms') def teardown(self, context): super(Reader, self).teardown(context) diff --git a/wlauto/workloads/skype/__init__.py b/wlauto/workloads/skype/__init__.py index 53bb6671..5a816b78 100755 --- a/wlauto/workloads/skype/__init__.py +++ b/wlauto/workloads/skype/__init__.py @@ -123,9 +123,12 @@ class Skype(AndroidUiAutoBenchmark): for line in wfh: match = regex.search(line) if match: - context.result.add_metric((match.group('key') + "_start"), match.group('value1')) - context.result.add_metric((match.group('key') + "_finish"), match.group('value2')) - context.result.add_metric((match.group('key') + "_duration"), match.group('value3')) + context.result.add_metric((match.group('key') + "_start"), + match.group('value1'), units='ms') + context.result.add_metric((match.group('key') + "_finish"), + match.group('value2'), units='ms') + context.result.add_metric((match.group('key') + "_duration"), + match.group('value3'), units='ms') def teardown(self, context): self.logger.info('===== teardown() ======')