summaryrefslogtreecommitdiff
path: root/src/cgls/cgls.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-04-20 16:06:58 +0200
committerLennart Poettering <lennart@poettering.net>2016-04-22 16:06:20 +0200
commit0ff308c8dea9a589ddbc437c097edc3fb26360d7 (patch)
tree0b8c57b31deee9ad658af8048e12c10b213a8e88 /src/cgls/cgls.c
parenta0e270198a9d58b58dff44a6504843f19458facd (diff)
shared: drop kernel_thread bool from cgroups show code
Make this an output flag instead, so that our function prototypes can lose one parameter
Diffstat (limited to 'src/cgls/cgls.c')
-rw-r--r--src/cgls/cgls.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
index d6fb10cac5..dcb5912b83 100644
--- a/src/cgls/cgls.c
+++ b/src/cgls/cgls.c
@@ -191,7 +191,8 @@ int main(int argc, char *argv[]) {
output_flags =
arg_all * OUTPUT_SHOW_ALL |
- (arg_full > 0) * OUTPUT_FULL_WIDTH;
+ (arg_full > 0) * OUTPUT_FULL_WIDTH |
+ arg_kernel_threads * OUTPUT_KERNEL_THREADS;
if (optind < argc) {
_cleanup_free_ char *root = NULL;
@@ -209,7 +210,7 @@ int main(int argc, char *argv[]) {
printf("Directory %s:\n", argv[i]);
fflush(stdout);
- q = show_cgroup_by_path(argv[i], NULL, 0, arg_kernel_threads, output_flags);
+ q = show_cgroup_by_path(argv[i], NULL, 0, output_flags);
} else {
_cleanup_free_ char *c = NULL, *p = NULL, *j = NULL;
const char *controller, *path;
@@ -235,7 +236,7 @@ int main(int argc, char *argv[]) {
show_cg_info(controller, path);
- q = show_cgroup(controller, path, NULL, 0, arg_kernel_threads, output_flags);
+ q = show_cgroup(controller, path, NULL, 0, output_flags);
}
if (q < 0)
@@ -258,7 +259,7 @@ int main(int argc, char *argv[]) {
printf("Working directory %s:\n", cwd);
fflush(stdout);
- r = show_cgroup_by_path(cwd, NULL, 0, arg_kernel_threads, output_flags);
+ r = show_cgroup_by_path(cwd, NULL, 0, output_flags);
done = true;
}
}
@@ -273,7 +274,7 @@ int main(int argc, char *argv[]) {
show_cg_info(SYSTEMD_CGROUP_CONTROLLER, root);
printf("-.slice\n");
- r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, root, NULL, 0, arg_kernel_threads, output_flags);
+ r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, root, NULL, 0, output_flags);
}
}