shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-08-30 05:50:12 +03:00
Code Activity

cgls: show controller without args too

Browse Source
This commit is contained in:
Evgeny Vereshchagin
2015-09-18 17:58:28 +00:00
parent 2b2eac39e8
commit 58033c91e3
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/cgls/cgls.c
View File

@ -165,6 +165,13 @@ static int get_cgroup_root(char **ret) {
return 0; return 0;
} }
static void show_cg_info(const char *controller, const char *path) {
if (cg_unified() <= 0)
printf("Controller %s; ", controller);
printf("Control group %s:\n", isempty(path) ? "/" : path);
fflush(stdout);
}
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
int r, output_flags; int r, output_flags;
@ -225,11 +232,7 @@ int main(int argc, char *argv[]) {
} else } else
path = root; path = root;
if (cg_unified() > 0) show_cg_info(controller, path);
printf("Control group %s:\n", path);
else
printf("Controller %s; control group %s:\n", controller, path);
fflush(stdout);
q = show_cgroup(controller, path, NULL, 0, arg_kernel_threads, output_flags); q = show_cgroup(controller, path, NULL, 0, arg_kernel_threads, output_flags);
} }
@ -266,8 +269,7 @@ int main(int argc, char *argv[]) {
if (r < 0) if (r < 0)
goto finish; goto finish;
printf("Control group %s:\n", isempty(root) ? "/" : root); show_cg_info(SYSTEMD_CGROUP_CONTROLLER, root);
fflush(stdout);
r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, root, NULL, 0, arg_kernel_threads, output_flags); r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, root, NULL, 0, arg_kernel_threads, output_flags);
} }