SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #26815 from keszybz/cgls-no-xattrs-by-default

Browse Source 
Do not show xattrs and cgroup ids in cgls by default
This commit is contained in:
Luca Boccassi
2023-03-15 00:24:02 +00:00
committed by GitHub
parent a247e95c28 ec38ec55ee
commit 544471bf83
3 changed files with 71 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
man/systemd-cgls.xml
+5 -2
View File
@@ -106,17 +106,20 @@
</varlistentry>
<varlistentry>
<term><option>-x</option></term>
<term><option>--xattr=</option></term>
<listitem><para>Controls whether to include information about extended attributes of the listed
control groups in the output. Expects a boolean value, defaults to yes.</para></listitem>
control groups in the output. With the long option, expects a boolean value. Defaults to no.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-c</option></term>
<term><option>--cgroup-id=</option></term>
<listitem><para>Controls whether to include the numeric ID of the listed control groups in the
output. Expects a boolean value, defaults to yes.</para></listitem>
output. With the long option, expects a boolean value. Defaults to no.</para></listitem>
</varlistentry>
<xi:include href="standard-options.xml" xpointer="help" />
src/cgls/cgls.c
+21 -17
View File
@@ -24,7 +24,7 @@
#include "unit-name.h"
static PagerFlags arg_pager_flags = 0;
static OutputFlags arg_output_flags = OUTPUT_CGROUP_XATTRS | OUTPUT_CGROUP_ID;
static OutputFlags arg_output_flags = 0;
static enum {
SHOW_UNIT_NONE,
@@ -54,11 +54,11 @@ static int help(void) {
" -a --all Show all groups, including empty\n"
" -u --unit Show the subtrees of specified system units\n"
" --user-unit Show the subtrees of specified user units\n"
" --xattr=BOOL Show cgroup extended attributes\n"
" --cgroup-id=BOOL Show cgroup ID\n"
" -x --xattr=BOOL Show cgroup extended attributes\n"
" -c --cgroup-id=BOOL Show cgroup ID\n"
" -l --full Do not ellipsize output\n"
" -k Include kernel threads in output\n"
" -M --machine= Show container\n"
" -M --machine=NAME Show container NAME\n"
"\nSee the %s for details.\n",
program_invocation_short_name,
link);
@@ -72,8 +72,6 @@ static int parse_argv(int argc, char *argv[]) {
ARG_NO_PAGER = 0x100,
ARG_VERSION,
ARG_USER_UNIT,
ARG_XATTR,
ARG_CGROUP_ID,
};
static const struct option options[] = {
@@ -85,8 +83,8 @@ static int parse_argv(int argc, char *argv[]) {
{ "machine", required_argument, NULL, 'M' },
{ "unit", optional_argument, NULL, 'u' },
{ "user-unit", optional_argument, NULL, ARG_USER_UNIT },
{ "xattr", required_argument, NULL, ARG_XATTR },
{ "cgroup-id", required_argument, NULL, ARG_CGROUP_ID },
{ "xattr", required_argument, NULL, 'x' },
{ "cgroup-id", required_argument, NULL, 'c' },
{}
};
@@ -95,7 +93,7 @@ static int parse_argv(int argc, char *argv[]) {
assert(argc >= 1);
assert(argv);
while ((c = getopt_long(argc, argv, "-hkalM:u::", options, NULL)) >= 0)
while ((c = getopt_long(argc, argv, "-hkalM:u::xc", options, NULL)) >= 0)
switch (c) {
@@ -143,18 +141,24 @@ static int parse_argv(int argc, char *argv[]) {
arg_machine = optarg;
break;
case ARG_XATTR:
r = parse_boolean(optarg);
if (r < 0)
return log_error_errno(r, "Failed to parse --xattr= value: %s", optarg);
case 'x':
if (optarg) {
r = parse_boolean(optarg);
if (r < 0)
return log_error_errno(r, "Failed to parse --xattr= value: %s", optarg);
} else
r = true;
SET_FLAG(arg_output_flags, OUTPUT_CGROUP_XATTRS, r);
break;
case ARG_CGROUP_ID:
r = parse_boolean(optarg);
if (r < 0)
return log_error_errno(r, "Failed to parse --cgroup-id= value: %s", optarg);
case 'c':
if (optarg) {
r = parse_boolean(optarg);
if (r < 0)
return log_error_errno(r, "Failed to parse --cgroup-id= value: %s", optarg);
} else
r = true;
SET_FLAG(arg_output_flags, OUTPUT_CGROUP_ID, r);
break;
src/cgtop/cgtop.c
+45 -44
View File
@@ -36,10 +36,10 @@
typedef struct Group {
char *path;
bool n_tasks_valid:1;
bool cpu_valid:1;
bool memory_valid:1;
bool io_valid:1;
bool n_tasks_valid;
bool cpu_valid;
bool memory_valid;
bool io_valid;
uint64_t n_tasks;
@@ -96,6 +96,7 @@ static Group *group_free(Group *g) {
return mfree(g);
}
DEFINE_PRIVATE_HASH_OPS_WITH_VALUE_DESTRUCTOR(group_hash_ops, char, path_hash_func, path_compare, Group, group_free);
static const char *maybe_format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) {
if (arg_raw) {
@@ -911,52 +912,19 @@ static const char* counting_what(void) {
return "userspace processes (excl. kernel)";
}
DEFINE_PRIVATE_HASH_OPS_WITH_VALUE_DESTRUCTOR(group_hash_ops, char, path_hash_func, path_compare, Group, group_free);
static int run(int argc, char *argv[]) {
static int loop(const char *root) {
_cleanup_hashmap_free_ Hashmap *a = NULL, *b = NULL;
unsigned iteration = 0;
usec_t last_refresh = 0;
bool quit = false, immediate_refresh = false;
_cleanup_free_ char *root = NULL;
PidsCount possible_count;
CGroupMask mask;
bool immediate_refresh = false;
int r;
log_setup();
r = parse_argv(argc, argv);
if (r <= 0)
return r;
r = cg_mask_supported(&mask);
if (r < 0)
return log_error_errno(r, "Failed to determine supported controllers: %m");
/* honor user selection unless pids controller is unavailable */
possible_count = (mask & CGROUP_MASK_PIDS) ? COUNT_PIDS : COUNT_ALL_PROCESSES;
arg_count = MIN(possible_count, arg_count);
if (arg_recursive_unset && arg_count == COUNT_PIDS)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Non-recursive counting is only supported when counting processes, not tasks. Use -P or -k.");
r = show_cgroup_get_path_and_warn(arg_machine, arg_root, &root);
if (r < 0)
return log_error_errno(r, "Failed to get root control group path: %m");
log_debug("CGroup path: %s", root);
a = hashmap_new(&group_hash_ops);
b = hashmap_new(&group_hash_ops);
if (!a || !b)
return log_oom();
signal(SIGWINCH, columns_lines_cache_reset);
if (arg_iterations == UINT_MAX)
arg_iterations = on_tty() ? 0 : 1;
while (!quit) {
for (;;) {
usec_t t;
char key;
@@ -978,7 +946,7 @@ static int run(int argc, char *argv[]) {
display(b);
if (arg_iterations && iteration >= arg_iterations)
break;
return 0;
if (!on_tty()) /* non-TTY: Empty newline as delimiter between polls */
fputs("\n", stdout);
@@ -1009,8 +977,7 @@ static int run(int argc, char *argv[]) {
break;
case 'q':
quit = true;
break;
return 0;
case 'p':
arg_order = ORDER_PATH;
@@ -1103,8 +1070,42 @@ static int run(int argc, char *argv[]) {
break;
}
}
}
return 0;
static int run(int argc, char *argv[]) {
_cleanup_free_ char *root = NULL;
CGroupMask mask;
int r;
log_setup();
r = parse_argv(argc, argv);
if (r <= 0)
return r;
r = cg_mask_supported(&mask);
if (r < 0)
return log_error_errno(r, "Failed to determine supported controllers: %m");
/* honor user selection unless pids controller is unavailable */
PidsCount possible_count = (mask & CGROUP_MASK_PIDS) ? COUNT_PIDS : COUNT_ALL_PROCESSES;
arg_count = MIN(possible_count, arg_count);
if (arg_recursive_unset && arg_count == COUNT_PIDS)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Non-recursive counting is only supported when counting processes, not tasks. Use -P or -k.");
r = show_cgroup_get_path_and_warn(arg_machine, arg_root, &root);
if (r < 0)
return log_error_errno(r, "Failed to get root control group path: %m");
log_debug("CGroup path: %s", root);
signal(SIGWINCH, columns_lines_cache_reset);
if (arg_iterations == UINT_MAX)
arg_iterations = on_tty() ? 0 : 1;
return loop(root);
}
DEFINE_MAIN_FUNCTION(run);