From 1fa93c04d2d2a51c35ee6d2868b1f50204786f42 Mon Sep 17 00:00:00 2001 From: Vasilis Flouris Date: Mon, 1 Jun 2015 18:56:13 +0100 Subject: [PATCH] fixes a few minor bugs. --- wlauto/common/linux/device.py | 2 +- wlauto/instrumentation/energy_model/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wlauto/common/linux/device.py b/wlauto/common/linux/device.py index 7d15c04d..f5577623 100644 --- a/wlauto/common/linux/device.py +++ b/wlauto/common/linux/device.py @@ -1018,7 +1018,7 @@ class LinuxDevice(BaseLinuxDevice): result = [] for line in lines: - parts = line.split() + parts = re.split('\s+', line, maxsplit=8) if parts: result.append(PsEntry(*(parts[0:1] + map(int, parts[1:5]) + parts[5:]))) diff --git a/wlauto/instrumentation/energy_model/__init__.py b/wlauto/instrumentation/energy_model/__init__.py index 32703a86..bcbcefab 100644 --- a/wlauto/instrumentation/energy_model/__init__.py +++ b/wlauto/instrumentation/energy_model/__init__.py @@ -634,7 +634,7 @@ class EnergyModelInstrument(Instrument): spec.id = '{}_{}_{}'.format(cluster, num_cpus, freq) spec.label = 'freq_{}_{}'.format(cluster, spec.label) spec.workload_parameters['taskset_mask'] = list_to_mask(self.get_cpus(cluster)) - spec.workload_parameters['num_threads'] = len(num_cpus) + spec.workload_parameters['num_threads'] = num_cpus # max_requests set to an arbitrary high values to make sure # sysbench runs for full duriation even on highly # performant cores. @@ -649,7 +649,7 @@ class EnergyModelInstrument(Instrument): return new_specs def disable_thermal_management(self): - if self.device.file_exists('/sys/class/thermal'): + if self.device.file_exists('/sys/class/thermal/thermal_zone0'): tzone_paths = self.device.execute('ls /sys/class/thermal/thermal_zone*') for tzpath in tzone_paths.strip().split(): mode_file = '{}/mode'.format(tzpath)