chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journald: allocate PAGE_SIZE bytes for selinux label length
[elogind.git]
/
src
/
cgls.c
diff --git
a/src/cgls.c
b/src/cgls.c
index 2bde743acf314420c9c9c2c3375facd452a172e2..d5417f9505e68de6a3f9d85757b847c1f2d11a48 100644
(file)
--- a/
src/cgls.c
+++ b/
src/cgls.c
@@
-30,20
+30,31
@@
#include "cgroup-util.h"
#include "log.h"
#include "util.h"
#include "cgroup-util.h"
#include "log.h"
#include "util.h"
+#include "pager.h"
+
+static bool arg_no_pager = false;
+static bool arg_kernel_threads = false;
static void help(void) {
printf("%s [OPTIONS...] [CGROUP...]\n\n"
"Recursively show control group contents.\n\n"
static void help(void) {
printf("%s [OPTIONS...] [CGROUP...]\n\n"
"Recursively show control group contents.\n\n"
- " -h --help Show this help\n",
+ " -h --help Show this help\n"
+ " --no-pager Do not pipe output into a pager\n"
+ " -k Include kernel threads in output\n",
program_invocation_short_name);
}
static int parse_argv(int argc, char *argv[]) {
program_invocation_short_name);
}
static int parse_argv(int argc, char *argv[]) {
+ enum {
+ ARG_NO_PAGER = 0x100
+ };
+
static const struct option options[] = {
static const struct option options[] = {
- { "help", no_argument, NULL, 'h' },
- { NULL, 0, NULL, 0 }
+ { "help", no_argument, NULL, 'h' },
+ { "no-pager", no_argument, NULL, ARG_NO_PAGER },
+ { NULL, 0, NULL, 0 }
};
int c;
};
int c;
@@
-51,7
+62,7
@@
static int parse_argv(int argc, char *argv[]) {
assert(argc >= 1);
assert(argv);
assert(argc >= 1);
assert(argv);
- while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) {
+ while ((c = getopt_long(argc, argv, "h
k
", options, NULL)) >= 0) {
switch (c) {
switch (c) {
@@
-59,6
+70,14
@@
static int parse_argv(int argc, char *argv[]) {
help();
return 0;
help();
return 0;
+ case ARG_NO_PAGER:
+ arg_no_pager = true;
+ break;
+
+ case 'k':
+ arg_kernel_threads = true;
+ break;
+
case '?':
return -EINVAL;
case '?':
return -EINVAL;
@@
-77,13
+96,17
@@
int main(int argc, char *argv[]) {
log_parse_environment();
log_open();
log_parse_environment();
log_open();
- if ((r = parse_argv(argc, argv)) < 0)
+ r = parse_argv(argc, argv);
+ if (r < 0)
goto finish;
else if (r == 0) {
retval = EXIT_SUCCESS;
goto finish;
}
goto finish;
else if (r == 0) {
retval = EXIT_SUCCESS;
goto finish;
}
+ if (!arg_no_pager)
+ pager_open();
+
if (optind < argc) {
unsigned i;
if (optind < argc) {
unsigned i;
@@
-91,26
+114,29
@@
int main(int argc, char *argv[]) {
int q;
printf("%s:\n", argv[i]);
int q;
printf("%s:\n", argv[i]);
- if ((q = show_cgroup_by_path(argv[i], NULL, 0)) < 0)
+ q = show_cgroup_by_path(argv[i], NULL, 0, arg_kernel_threads);
+ if (q < 0)
r = q;
}
} else {
char *p;
r = q;
}
} else {
char *p;
- if (!(p = get_current_dir_name())) {
+ p = get_current_dir_name();
+ if (!p) {
log_error("Cannot determine current working directory: %m");
goto finish;
}
if (path_startswith(p, "/sys/fs/cgroup")) {
printf("Working Directory %s:\n", p);
log_error("Cannot determine current working directory: %m");
goto finish;
}
if (path_startswith(p, "/sys/fs/cgroup")) {
printf("Working Directory %s:\n", p);
- r = show_cgroup_by_path(p, NULL, 0);
+ r = show_cgroup_by_path(p, NULL, 0
, arg_kernel_threads
);
} else {
char *root = NULL;
const char *t = NULL;
} else {
char *root = NULL;
const char *t = NULL;
- if ((r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 1, &root)) < 0)
+ r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 1, &root);
+ if (r < 0)
t = "/";
else {
if (endswith(root, "/system"))
t = "/";
else {
if (endswith(root, "/system"))
@@
-119,7
+145,7
@@
int main(int argc, char *argv[]) {
t = root[0] ? root : "/";
}
t = root[0] ? root : "/";
}
- r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, t, NULL, 0);
+ r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, t, NULL, 0
, arg_kernel_threads
);
free(root);
}
free(root);
}
@@
-132,6
+158,7
@@
int main(int argc, char *argv[]) {
retval = EXIT_SUCCESS;
finish:
retval = EXIT_SUCCESS;
finish:
+ pager_close();
return retval;
}
return retval;
}