rpm/tuned
SHA256
1
0
Fork 0
forked from pool/tuned
Code Pull Requests Activity

Accepting request 315866 from home:bmwiedemann:branches:Base:System

Browse Source 
fix syntax (bnc#937647)

OBS-URL: https://build.opensuse.org/request/show/315866
OBS-URL: https://build.opensuse.org/package/show/Base:System/tuned?expand=0&rev=32
This commit is contained in:
Denisart Benjamin
2015-07-10 20:35:28 +00:00
committed by Git OBS Bridge
parent 7cf0298290
commit f4273c4f86
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tuned-2.4.0-use_cpupower_for_intel_perf_bias.patch
View File

@@ -1,8 +1,8 @@
Index: tuned-2.3.0/tuned/plugins/plugin_cpu.py Index: tuned-2.4.1/tuned/plugins/plugin_cpu.py
=================================================================== ===================================================================
--- tuned-2.3.0.orig/tuned/plugins/plugin_cpu.py --- tuned-2.4.1.orig/tuned/plugins/plugin_cpu.py
+++ tuned-2.3.0/tuned/plugins/plugin_cpu.py +++ tuned-2.4.1/tuned/plugins/plugin_cpu.py
@@ -91,7 +91,8 @@ @@ -91,7 +91,8 @@ class CPULatencyPlugin(base.Plugin):
# Check for cpupower, use workaround if not available # Check for cpupower, use workaround if not available
self._check_cpupower() self._check_cpupower()
# Check for x86_energy_perf_policy, ignore if not available / supported # Check for x86_energy_perf_policy, ignore if not available / supported
@@ -12,7 +12,7 @@ Index: tuned-2.3.0/tuned/plugins/plugin_cpu.py
# Check for intel_pstate # Check for intel_pstate
self._check_intel_pstate() self._check_intel_pstate()
else: else:
@@ -207,7 +208,17 @@ @@ -207,7 +208,17 @@ class CPULatencyPlugin(base.Plugin):
@command_set("energy_perf_bias", per_device=True) @command_set("energy_perf_bias", per_device=True)
def _set_energy_perf_bias(self, energy_perf_bias, device): def _set_energy_perf_bias(self, energy_perf_bias, device):
@@ -26,19 +26,19 @@ Index: tuned-2.3.0/tuned/plugins/plugin_cpu.py
+ elif bias_str == "normal": + elif bias_str == "normal":
+ bias_str = "6" + bias_str = "6"
+ cpu_id = device.lstrip("cpu") + cpu_id = device.lstrip("cpu")
+ tuned.utils.commands.execute(["cpupower", "-c", cpu_id, "set", "-b", bias_str]) + self._cmd.execute(["cpupower", "-c", cpu_id, "set", "-b", bias_str])
+ elif self._has_energy_perf_bias: + elif self._has_energy_perf_bias:
log.info("setting energy_perf_bias '%s' on cpu '%s'" % (energy_perf_bias, device)) log.info("setting energy_perf_bias '%s' on cpu '%s'" % (energy_perf_bias, device))
cpu_id = device.lstrip("cpu") cpu_id = device.lstrip("cpu")
self._cmd.execute(["x86_energy_perf_policy", "-c", cpu_id, str(energy_perf_bias)]) self._cmd.execute(["x86_energy_perf_policy", "-c", cpu_id, str(energy_perf_bias)])
@@ -215,14 +226,21 @@ @@ -215,14 +226,21 @@ class CPULatencyPlugin(base.Plugin):
@command_get("energy_perf_bias") @command_get("energy_perf_bias")
def _get_energy_perf_bias(self, device): def _get_energy_perf_bias(self, device):
energy_perf_bias = None energy_perf_bias = None
- if self._has_energy_perf_bias: - if self._has_energy_perf_bias:
+ if self._has_cpupower is True: + if self._has_cpupower is True:
+ cpu_id = device.lstrip("cpu") + cpu_id = device.lstrip("cpu")
+ retcode, lines = tuned.utils.commands.execute(["cpupower", "-c", cpu_id, "info", "-b"]) + retcode, lines = self._cmd.execute(["cpupower", "-c", cpu_id, "info", "-b"])
+ elif self._has_energy_perf_bias: + elif self._has_energy_perf_bias:
cpu_id = device.lstrip("cpu") cpu_id = device.lstrip("cpu")
retcode, lines = self._cmd.execute(["x86_energy_perf_policy", "-c", cpu_id, "-r"]) retcode, lines = self._cmd.execute(["x86_energy_perf_policy", "-c", cpu_id, "-r"])
@@ -48,7 +48,7 @@ Index: tuned-2.3.0/tuned/plugins/plugin_cpu.py
- if len(l) == 2: - if len(l) == 2:
- energy_perf_bias = l[1] - energy_perf_bias = l[1]
- break - break
+ else: + else:
+ return None + return None
+ if retcode == 0: + if retcode == 0:
+ for line in lines.splitlines(): + for line in lines.splitlines():

5
tuned.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jul 10 12:08:42 UTC 2015 - bwiedemann@suse.com
- fix syntax (bnc#937647)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 5 15:07:22 UTC 2015 - p.drouand@gmail.com Mon Jan 5 15:07:22 UTC 2015 - p.drouand@gmail.com

2
tuned.spec
View File

@@ -1,7 +1,7 @@
# #
# spec file for package tuned # spec file for package tuned
# #
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed