From c8f118da4f194b3920d2e0ca5c37b8372ae1ea95 Mon Sep 17 00:00:00 2001 From: Patrick Bellasi Date: Wed, 31 Aug 2016 11:39:33 +0100 Subject: [PATCH 1/2] cgroups: change log level to avoid cluttering caller output Signed-off-by: Patrick Bellasi --- devlib/module/cgroups.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/devlib/module/cgroups.py b/devlib/module/cgroups.py index 56857ba..f6c7c95 100644 --- a/devlib/module/cgroups.py +++ b/devlib/module/cgroups.py @@ -150,16 +150,16 @@ class Controller(object): raise ValueError('wrong type for "exclude" parameter, ' 'it must be a str or a list') - logging.info('Moving all tasks into %s', dest) + logging.debug('Moving all tasks into %s', dest) # Build list of tasks to exclude grep_filters = '' for comm in exclude: grep_filters += '-e "{}" '.format(comm) - logging.debug('Using grep filter: %s', grep_filters) + logging.debug(' using grep filter: %s', grep_filters) if grep_filters != '': - logging.info('Excluding tasks which name matches:') - logging.info('%s', ','.join(exclude)) + logging.debug(' excluding tasks which name matches:') + logging.debug(' %s', ', '.join(exclude)) for cgroup in self._cgroups: if cgroup != dest: @@ -453,11 +453,11 @@ class CgroupsModule(Module): # Move all tasks into the freezer group freezer.move_all_tasks_to('/DEVLIB_FREEZER', exclude) - logging.info("Non freezable tasks:") + # Get list of not frozen tasks, which is reported as output tasks = freezer.tasks('/') - for tid in tasks: - logging.info("%5d: %s", tid, tasks[tid]) # Freeze all tasks freezer_cg.set(state='FROZEN') + return tasks + From 730bb606b1f2fc868387f01535c27c6a416cebc5 Mon Sep 17 00:00:00 2001 From: Patrick Bellasi Date: Wed, 31 Aug 2016 11:40:10 +0100 Subject: [PATCH 2/2] cgroup: fix documentation of freeze function Signed-off-by: Patrick Bellasi --- devlib/module/cgroups.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/devlib/module/cgroups.py b/devlib/module/cgroups.py index f6c7c95..f605751 100644 --- a/devlib/module/cgroups.py +++ b/devlib/module/cgroups.py @@ -425,7 +425,7 @@ class CgroupsModule(Module): def freeze(self, exclude=[], thaw=False): """ - Freeze all tasks while keeping a live console + Freeze all user-space tasks but the specified ones A freezer cgroup is used to stop all the tasks in the target system but the ones which name match one of the path specified by the exclude @@ -435,7 +435,10 @@ class CgroupsModule(Module): the PID of these tasks. :param exclude: list of commands paths to exclude from freezer - :type exlude: list(str) + :type exclude: list(str) + + :param thaw: if true thaw tasks instead + :type thaw: bool """ # Create Freezer CGroup