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

list_file_systems: fix for Android M and Linux devices

Browse Source 
In previous versions of Android, "mount" returned output in the format
similar to fstab entries, which is what list_file_systems expected. This
fixes it to be able to handle the more traditional "mount" output in the
format

	<device> on <mount point> type <fs type> <options>

as well as continue to parse the Android output correctly.
This commit is contained in:
Sergei Trofimov 2015-06-16 08:42:50 +01:00
parent 92ddcbb1e3
commit 4d3feeba64
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wlauto/common/linux/device.py
View File

@ -37,6 +37,8 @@ WRITE_ONLY_TUNABLES = {
'interactive': ['boostpulse'] 'interactive': ['boostpulse']
} }
FSTAB_ENTRY_REGEX = re.compile(r'(\S+) on (\S+) type (\S+) \((\S+)\)')
FstabEntry = namedtuple('FstabEntry', ['device', 'mount_point', 'fs_type', 'options', 'dump_freq', 'pass_num']) FstabEntry = namedtuple('FstabEntry', ['device', 'mount_point', 'fs_type', 'options', 'dump_freq', 'pass_num'])
PsEntry = namedtuple('PsEntry', 'user pid ppid vsize rss wchan pc state name') PsEntry = namedtuple('PsEntry', 'user pid ppid vsize rss wchan pc state name')
@ -285,7 +287,13 @@ class BaseLinuxDevice(Device): # pylint: disable=abstract-method
output = self.execute('mount') output = self.execute('mount')
fstab = [] fstab = []
for line in output.split('\n'): for line in output.split('\n'):
fstab.append(FstabEntry(*line.split())) match = FSTAB_ENTRY_REGEX.search(line)
if match:
fstab.append(FstabEntry(match.group(1), match.group(2),
match.group(3), match.group(4),
None, None))
else: # assume pre-M Android
fstab.append(FstabEntry(*line.split()))
return fstab return fstab
# Process query and control # Process query and control