ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lscpu: fix "caches" header 

It's possible that lscpu does not print any caches if full caches size
is zero. In this case we do not need the header.

Addresses: https://github.com/karelzak/util-linux/issues/1207
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2021-04-28 10:51:07 +02:00
parent 1f54d9cc09
commit 071d3135d3
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
sys-utils/lscpu.c
View File

@ -919,6 +919,7 @@ static void print_summary(struct lscpu_cxt *cxt)
size_t i = 0;
struct libscols_table *tb;
struct libscols_line *sec = NULL;
int hdr_caches = 0;
scols_init_debug(0);
@ -1040,8 +1041,6 @@ static void print_summary(struct lscpu_cxt *cxt)
/* The caches are sorted by name, cxt->caches[] may contains
* multiple instances for the same name.
*/
sec = add_summary_e(tb, NULL, _("Caches (sum of all):"));
for (i = 0; i < cxt->ncaches; i++) {
const char *name = cxt->caches[i].name;
uint64_t sz;
@ -1052,6 +1051,11 @@ static void print_summary(struct lscpu_cxt *cxt)
sz = lscpu_get_cache_full_size(cxt, name, &n);
if (!sz)
continue;
if (!hdr_caches) {
sec = add_summary_e(tb, NULL, _("Caches (sum of all):"));
hdr_caches = 1;
}
snprintf(field, sizeof(field), is_term ? _("%s:") : _("%s cache:"), name);
if (cxt->bytes)
add_summary_sprint(tb, sec, field,
@ -1073,26 +1077,25 @@ static void print_summary(struct lscpu_cxt *cxt)
}
}
if (cxt->necaches) {
if (!cxt->ncaches)
for (i = 0; i < cxt->necaches; i++) {
struct lscpu_cache *ca = &cxt->ecaches[i];
if (ca->size == 0)
continue;
if (!hdr_caches) {
sec = add_summary_e(tb, NULL, _("Caches:"));
for (i = 0; i < cxt->necaches; i++) {
struct lscpu_cache *ca = &cxt->ecaches[i];
if (ca->size == 0)
continue;
snprintf(field, sizeof(field), is_term ? _("%s:") : _("%s cache:"), ca->name);
if (cxt->bytes)
add_summary_x(tb, sec, field, "%" PRIu64, ca->size);
else {
char *tmp = size_to_human_string(
SIZE_SUFFIX_3LETTER |
SIZE_SUFFIX_SPACE,
ca->size);
add_summary_s(tb, sec, field, tmp);
free(tmp);
}
hdr_caches = 1;
}
snprintf(field, sizeof(field), is_term ? _("%s:") : _("%s cache:"), ca->name);
if (cxt->bytes)
add_summary_x(tb, sec, field, "%" PRIu64, ca->size);
else {
char *tmp = size_to_human_string(
SIZE_SUFFIX_3LETTER |
SIZE_SUFFIX_SPACE,
ca->size);
add_summary_s(tb, sec, field, tmp);
free(tmp);
}
}
sec = NULL;