picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cgtop: add option to show a single cgroup subtree (#3413)

Browse source 
When many services are running, it was difficult to see only the interesting ones.
This patch allows to show only the subtree of interest.
This commit is contained in:
Alessandro Puccetti 2016-06-05 19:42:37 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent 0a62f81045
commit 308253c5a2
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
man/systemd-cgtop.xml
View file

@ -52,6 +52,7 @@
<cmdsynopsis>
<command>systemd-cgtop</command>
<arg choice="opt" rep="repeat">OPTIONS</arg>
<arg choice="opt">GROUP</arg>
</cmdsynopsis>
</refsynopsisdiv>
@ -62,7 +63,9 @@
groups of the local Linux control group hierarchy, ordered by
their CPU, memory, or disk I/O load. The display is refreshed in
regular intervals (by default every 1s), similar in style to
<citerefentry project='man-pages'><refentrytitle>top</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
<citerefentry project='man-pages'><refentrytitle>top</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
If a control group path is specified, shows only the services of
the specified control group.</para>
<para>If <command>systemd-cgtop</command> is not connected to a
tty, no column headers are printed and the default is to only run
@ -252,7 +255,8 @@
<listitem><para>Limit control groups shown to the part
corresponding to the container
<replaceable>MACHINE</replaceable>.</para></listitem>
<replaceable>MACHINE</replaceable>.
This option may not be used when a control group path is specified.</para></listitem>
</varlistentry>
<xi:include href="standard-options.xml" xpointer="help" />

18
src/cgtop/cgtop.c
View file

@ -72,6 +72,7 @@ static bool arg_batch = false;
static bool arg_raw = false;
static usec_t arg_delay = 1*USEC_PER_SEC;
static char* arg_machine = NULL;
static char* arg_root = NULL;
static bool arg_recursive = true;
static enum {
@ -653,7 +654,7 @@ static void display(Hashmap *a) {
}
static void help(void) {
printf("%s [OPTIONS...]\n\n"
printf("%s [OPTIONS...] [CGROUP]\n\n"
"Show top control groups by their resource usage.\n\n"
" -h --help Show this help\n"
" --version Show package version\n"
@ -835,7 +836,13 @@ static int parse_argv(int argc, char *argv[]) {
assert_not_reached("Unhandled option");
}
if (optind < argc) {
if (optind == argc-1) {
if (arg_machine) {
log_error("Specifying a control group path together with the -M option is not allowed");
return -EINVAL;
}
arg_root = argv[optind];
} else if (optind < argc) {
log_error("Too many arguments.");
return -EINVAL;
}
@ -864,6 +871,13 @@ static int get_cgroup_root(char **ret) {
const char *m;
int r;
if (arg_root) {
*ret = strdup(arg_root);
if (!*ret)
return log_oom();
return 0;
}
if (!arg_machine) {
r = cg_get_root_path(ret);
if (r < 0)