Skip to content

Commit 9ef2234

Browse files
committed
nvme-print-stdout: add name space usage binary suffix verbose print
Since currently only the SI suffix values output. Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
1 parent 9705407 commit 9ef2234

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

nvme-print-stdout.c

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5376,26 +5376,34 @@ static void stdout_simple_list(nvme_root_t r)
53765376

53775377
static void stdout_ns_details(nvme_ns_t n)
53785378
{
5379-
char usage[128] = { 0 }, format[128] = { 0 };
5379+
char usage[128] = { 0 }, format[128] = { 0 }, usage_binary[128] = { 0 };
53805380
char devname[128] = { 0 }, genname[128] = { 0 };
53815381

53825382
long long lba = nvme_ns_get_lba_size(n);
53835383
double nsze = nvme_ns_get_lba_count(n) * lba;
53845384
double nuse = nvme_ns_get_lba_util(n) * lba;
5385+
double nsze_binary = nsze, nuse_binary = nuse;
53855386

53865387
const char *s_suffix = suffix_si_get(&nsze);
53875388
const char *u_suffix = suffix_si_get(&nuse);
53885389
const char *l_suffix = suffix_binary_get(&lba);
53895390

5390-
sprintf(usage, "%6.2f %2sB / %6.2f %2sB", nuse, u_suffix, nsze, s_suffix);
5391+
const char *s_suffix_binary, *u_suffix_binary;
5392+
5393+
sprintf(usage, "%6.2f %1sB / %6.2f %1sB", nuse, u_suffix, nsze, s_suffix);
53915394
sprintf(format, "%3.0f %2sB + %2d B", (double)lba, l_suffix,
53925395
nvme_ns_get_meta_size(n));
53935396

5397+
s_suffix_binary = suffix_dbinary_get(&nsze_binary);
5398+
u_suffix_binary = suffix_dbinary_get(&nuse_binary);
5399+
sprintf(usage_binary, "(%7.2f %2sB / %7.2f %2sB)", nuse_binary, u_suffix_binary,
5400+
nsze_binary, s_suffix_binary);
5401+
53945402
nvme_dev_full_path(n, devname, sizeof(devname));
53955403
nvme_generic_full_path(n, genname, sizeof(genname));
53965404

5397-
printf("%-12s %-12s %#-10x %-26s %-16s ", devname,
5398-
genname, nvme_ns_get_nsid(n), usage, format);
5405+
printf("%-17s %-17s %#-10x %-21s %-25s %-16s ", devname,
5406+
genname, nvme_ns_get_nsid(n), usage, usage_binary, format);
53995407
}
54005408

54015409
static bool stdout_detailed_name(const char *name, void *arg)
@@ -5540,9 +5548,9 @@ static void stdout_detailed_list(nvme_root_t r)
55405548
strset_iterate(&res.ctrls, stdout_detailed_ctrl, &res);
55415549
printf("\n");
55425550

5543-
printf("%-17s %-17s %-10s %-26s %-16s %-16s\n", "Device", "Generic",
5551+
printf("%-17s %-17s %-10s %-49s %-16s %-16s\n", "Device", "Generic",
55445552
"NSID", "Usage", "Format", "Controllers");
5545-
printf("%-.17s %-.17s %-.10s %-.26s %-.16s %-.16s\n", dash, dash, dash,
5553+
printf("%-.17s %-.17s %-.10s %-.49s %-.16s %-.16s\n", dash, dash, dash,
55465554
dash, dash, dash);
55475555
strset_iterate(&res.namespaces, stdout_detailed_ns, &res);
55485556

0 commit comments

Comments
 (0)