sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-01-31 02:00:45 +00:00
Code Issues Releases Wiki Activity

module/cgroups: Fix move_tasks()/move_all_tasks_to()

Browse Source 
Both move_all_tasks_to() and move_tasks() take a list of grep patterns
to exclude.

It turned out that move_all_tasks_to() was calling move_tasks() with a
string instead of a list, leading to broken quoting.

Fix that by passing the pattern list to move_tasks() and let
move_tasks() add the "-e" option in front of it. Also add a
DeprecationWarning in move_tasks() if someone passes a string instead of
an iterable of strings.
This commit is contained in:
Douglas Raillard 2022-05-16 12:40:04 +01:00 committed by Marc Bonnici
parent 03569fb01f
commit cd8720b901
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
devlib/module/cgroups.py
View File

@ -17,6 +17,8 @@ import logging
import re import re
from collections import namedtuple from collections import namedtuple
from shlex import quote from shlex import quote
import itertools
import warnings
from devlib.module import Module from devlib.module import Module
from devlib.exception import TargetStableError from devlib.exception import TargetStableError
@ -123,9 +125,20 @@ class Controller(object):
return cgroups return cgroups
def move_tasks(self, source, dest, exclude=None): def move_tasks(self, source, dest, exclude=None):
if isinstance(exclude, str):
warnings.warn("Controller.move_tasks() takes needs a _list_ of exclude patterns, not a string", DeprecationWarning)
exclude = [exclude]
if exclude is None: if exclude is None:
exclude = [] exclude = []
exclude = ' '.join(
itertools.chain.from_iterable(
('-e', quote(pattern))
for pattern in exclude
)
)
srcg = self.cgroup(source) srcg = self.cgroup(source)
dstg = self.cgroup(dest) dstg = self.cgroup(dest)
@ -133,7 +146,7 @@ class Controller(object):
'cgroups_tasks_move {src} {dst} {exclude}'.format( 'cgroups_tasks_move {src} {dst} {exclude}'.format(
src=quote(srcg.directory), src=quote(srcg.directory),
dst=quote(dstg.directory), dst=quote(dstg.directory),
exclude=' '.join(map(quote, exclude)) exclude=exclude,
), ),
as_root=True, as_root=True,
) )
@ -165,18 +178,11 @@ class Controller(object):
self.logger.debug('Moving all tasks into %s', dest) self.logger.debug('Moving all tasks into %s', dest)
# Build list of tasks to exclude # Build list of tasks to exclude
grep_filters = ' '.join( self.logger.debug(' using grep filter: %s', exclude)
'-e {}'.format(comm)
for comm in exclude
)
self.logger.debug(' using grep filter: %s', grep_filters)
if grep_filters != '':
self.logger.debug(' excluding tasks which name matches:')
self.logger.debug(' %s', ', '.join(exclude))
for cgroup in self.list_all(): for cgroup in self.list_all():
if cgroup != dest: if cgroup != dest:
self.move_tasks(cgroup, dest, grep_filters) self.move_tasks(cgroup, dest, exclude)
# pylint: disable=too-many-locals # pylint: disable=too-many-locals
def tasks(self, cgroup, def tasks(self, cgroup,