sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-02-22 04:49:00 +00:00
Code Issues Releases Wiki Activity

Fixes missing directories problem in DynamicFrequencyInstrument

Browse Source
This commit is contained in:
Vasilis Flouris 2015-06-12 14:53:59 +01:00 committed by devlab
parent 7ee44fb0e4
commit 0d3e6b8386
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
wlauto/instrumentation/misc/__init__.py
View File

@ -58,6 +58,10 @@ class SysfsExtractor(Instrument):
mount_command = 'mount -t tmpfs -o size={} tmpfs {}' mount_command = 'mount -t tmpfs -o size={} tmpfs {}'
extract_timeout = 30 extract_timeout = 30
tarname = 'sysfs.tar.gz' tarname = 'sysfs.tar.gz'
DEVICE_PATH = 0
BEFORE_PATH = 1
AFTER_PATH = 2
DIFF_PATH = 3
parameters = [ parameters = [
Parameter('paths', kind=list_of_strings, mandatory=True, Parameter('paths', kind=list_of_strings, mandatory=True,
@ -93,18 +97,19 @@ class SysfsExtractor(Instrument):
as_root=True) as_root=True)
def setup(self, context): def setup(self, context):
self.before_dirs = [ before_dirs = [
_d(os.path.join(context.output_directory, 'before', self._local_dir(d))) _d(os.path.join(context.output_directory, 'before', self._local_dir(d)))
for d in self.paths for d in self.paths
] ]
self.after_dirs = [ after_dirs = [
_d(os.path.join(context.output_directory, 'after', self._local_dir(d))) _d(os.path.join(context.output_directory, 'after', self._local_dir(d)))
for d in self.paths for d in self.paths
] ]
self.diff_dirs = [ diff_dirs = [
_d(os.path.join(context.output_directory, 'diff', self._local_dir(d))) _d(os.path.join(context.output_directory, 'diff', self._local_dir(d)))
for d in self.paths for d in self.paths
] ]
self.device_and_host_paths = zip(self.paths, before_dirs, after_dirs, diff_dirs)
if self.use_tmpfs: if self.use_tmpfs:
for d in self.paths: for d in self.paths:
@ -128,7 +133,7 @@ class SysfsExtractor(Instrument):
self.device.execute('busybox cp -Hr {} {}'.format(d, dest_dir), self.device.execute('busybox cp -Hr {} {}'.format(d, dest_dir),
as_root=True, check_exit_code=False) as_root=True, check_exit_code=False)
else: # not rooted else: # not rooted
for dev_dir, before_dir in zip(self.paths, self.before_dirs): for dev_dir, before_dir, _, _ in self.device_and_host_paths:
self.device.pull_file(dev_dir, before_dir) self.device.pull_file(dev_dir, before_dir)
def slow_stop(self, context): def slow_stop(self, context):
@ -140,7 +145,7 @@ class SysfsExtractor(Instrument):
self.device.execute('busybox cp -Hr {} {}'.format(d, dest_dir), self.device.execute('busybox cp -Hr {} {}'.format(d, dest_dir),
as_root=True, check_exit_code=False) as_root=True, check_exit_code=False)
else: # not using tmpfs else: # not using tmpfs
for dev_dir, after_dir in zip(self.paths, self.after_dirs): for dev_dir, _, after_dir, _ in self.device_and_host_paths:
self.device.pull_file(dev_dir, after_dir) self.device.pull_file(dev_dir, after_dir)
def update_result(self, context): def update_result(self, context):
@ -156,11 +161,13 @@ class SysfsExtractor(Instrument):
self.device.delete_file(on_device_tarball) self.device.delete_file(on_device_tarball)
os.remove(on_host_tarball) os.remove(on_host_tarball)
for after_dir in self.after_dirs: for paths in self.device_and_host_paths:
if not os.listdir(after_dir): after_dir = paths[self.AFTER_PATH]
dev_dir = paths[self.DEVICE_PATH].strip('*') # remove potential trailing '*'
if not os.listdir(after_dir) and self.device.listdir(dev_dir)[0]:
self.logger.error('sysfs files were not pulled from the device.') self.logger.error('sysfs files were not pulled from the device.')
return self.device_and_host_paths.remove(paths) # Path is removed to skip diffing it
for diff_dir, before_dir, after_dir in zip(self.diff_dirs, self.before_dirs, self.after_dirs): for _, before_dir, after_dir, diff_dir in self.device_and_host_paths:
_diff_sysfs_dirs(before_dir, after_dir, diff_dir) _diff_sysfs_dirs(before_dir, after_dir, diff_dir)
def teardown(self, context): def teardown(self, context):