mirror of
https://github.com/ARM-software/workload-automation.git
synced 2025-03-14 14:48:53 +00:00
Merge pull request #14 from jimboatarm/fudge
Fix timing instrumentation logs for Skype and GooglePhotos
This commit is contained in:
commit
cd3d08dae9
@ -74,19 +74,18 @@ class Googlephotos(AndroidUiAutoBenchmark):
|
||||
def update_result(self, context):
|
||||
super(Googlephotos, self).update_result(context)
|
||||
|
||||
if self.dumpsys_enabled:
|
||||
self.device.pull_file(self.output_file, context.output_directory)
|
||||
result_file = os.path.join(context.output_directory, self.instrumentation_log)
|
||||
self.device.pull_file(self.output_file, context.output_directory)
|
||||
result_file = os.path.join(context.output_directory, self.instrumentation_log)
|
||||
|
||||
with open(result_file, 'r') as wfh:
|
||||
pattern = r'(?P<key>\w+)\s+(?P<value1>\d+)\s+(?P<value2>\d+)\s+(?P<value3>\d+)'
|
||||
regex = re.compile(pattern)
|
||||
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'))
|
||||
with open(result_file, 'r') as wfh:
|
||||
pattern = r'(?P<key>\w+)\s+(?P<value1>\d+)\s+(?P<value2>\d+)\s+(?P<value3>\d+)'
|
||||
regex = re.compile(pattern)
|
||||
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'))
|
||||
|
||||
def teardown(self, context):
|
||||
super(Googlephotos, self).teardown(context)
|
||||
|
@ -117,14 +117,18 @@ class Skype(AndroidUiAutoBenchmark):
|
||||
|
||||
# process results and add them using
|
||||
# context.result.add_metric
|
||||
with open(results_file, 'r') as wfh:
|
||||
regex = re.compile(r'(\w+)\s+(\d+)\s+(\d+)\s+(\d+)')
|
||||
self.device.pull_file(self.output_file, context.output_directory)
|
||||
result_file = op.join(context.output_directory, self.instrumentation_log)
|
||||
|
||||
with open(result_file, 'r') as wfh:
|
||||
pattern = r'(?P<key>\w+)\s+(?P<value1>\d+)\s+(?P<value2>\d+)\s+(?P<value3>\d+)'
|
||||
regex = re.compile(pattern)
|
||||
for line in wfh:
|
||||
match = regex.search(line)
|
||||
if match:
|
||||
context.result.add_metric((match.group(1) + "_start"), match.group(2))
|
||||
context.result.add_metric((match.group(1) + "_finish"), match.group(3))
|
||||
context.result.add_metric((match.group(1) + "_duration"), match.group(4))
|
||||
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'))
|
||||
|
||||
def teardown(self, context):
|
||||
self.logger.info('===== teardown() ======')
|
||||
|
Loading…
x
Reference in New Issue
Block a user