|
 |
aa6282 |
diff --git a/tuned/plugins/plugin_scheduler.py b/tuned/plugins/plugin_scheduler.py
|
|
|
aa6282 |
index 25c38dd..07fac52 100644
|
|
|
aa6282 |
--- a/tuned/plugins/plugin_scheduler.py
|
|
|
aa6282 |
+++ b/tuned/plugins/plugin_scheduler.py
|
|
|
aa6282 |
@@ -379,8 +379,12 @@ class SchedulerPlugin(base.Plugin):
|
|
|
aa6282 |
|
|
|
aa6282 |
def _set_all_obj_affinity(self, objs, affinity, threads = False, intersect = False):
|
|
|
aa6282 |
_affinity = affinity
|
|
|
aa6282 |
- for obj in objs:
|
|
|
aa6282 |
- if self._affinity_changeable(obj, process = objs[obj]) != 1:
|
|
|
aa6282 |
+ psl = [v for v in objs if re.search(self._ps_whitelist, self._get_stat_comm(v)) is not None]
|
|
|
aa6282 |
+ if self._ps_blacklist != "":
|
|
|
aa6282 |
+ psl = [v for v in psl if re.search(self._ps_blacklist, self._get_stat_comm(v)) is None]
|
|
|
aa6282 |
+ psd = dict([(v.pid, v) for v in psl])
|
|
|
aa6282 |
+ for obj in psd:
|
|
|
aa6282 |
+ if self._affinity_changeable(obj, process = psd[obj]) != 1:
|
|
|
aa6282 |
continue
|
|
|
aa6282 |
prev_affinity = self._get_affinity2(obj)
|
|
|
aa6282 |
if prev_affinity is None:
|
|
|
aa6282 |
@@ -391,8 +395,8 @@ class SchedulerPlugin(base.Plugin):
|
|
|
aa6282 |
if not self._set_affinity2(obj, _affinity):
|
|
|
aa6282 |
continue
|
|
|
aa6282 |
# process threads
|
|
|
aa6282 |
- if not threads and objs[obj].has_key("threads"):
|
|
|
aa6282 |
- self._set_all_obj_affinity(dict(objs[obj]["threads"].items()), affinity, True, intersect)
|
|
|
aa6282 |
+ if not threads and "threads" in psd[obj]:
|
|
|
aa6282 |
+ self._set_all_obj_affinity(psd[obj]["threads"].values(), affinity, True, intersect)
|
|
|
aa6282 |
|
|
|
aa6282 |
def _get_stat_comm(self, o):
|
|
|
aa6282 |
try:
|
|
|
aa6282 |
@@ -405,11 +409,7 @@ class SchedulerPlugin(base.Plugin):
|
|
|
aa6282 |
affinity_hex = self._cmd.cpulist2hex(_affinity)
|
|
|
aa6282 |
ps = procfs.pidstats()
|
|
|
aa6282 |
ps.reload_threads()
|
|
|
aa6282 |
- psl = filter(lambda v: re.search(self._ps_whitelist, self._get_stat_comm(v)) is not None, ps.values())
|
|
|
aa6282 |
- if self._ps_blacklist != "":
|
|
|
aa6282 |
- psl = filter(lambda v: re.search(self._ps_blacklist, self._get_stat_comm(v)) is None, psl)
|
|
|
aa6282 |
- psd = dict(map(lambda v: (v.pid, v), psl))
|
|
|
aa6282 |
- self._set_all_obj_affinity(psd, affinity, False, intersect)
|
|
|
aa6282 |
+ self._set_all_obj_affinity(ps.values(), affinity, False, intersect)
|
|
|
aa6282 |
|
|
|
aa6282 |
# process IRQs
|
|
|
aa6282 |
irqs = procfs.interrupts()
|