alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-12-09 00:00:17 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

cmd_top: Various improvements

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2025-11-25 19:33:29 -05:00
parent 6ccc88dcf1
commit e71cfc44c0
1 changed files with 51 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
c_src/cmd_top.c
View File

@ -28,6 +28,24 @@ static struct bch_ioctl_query_counters *read_counters(struct bchfs_handle fs, un
return ret; return ret;
} }
static void prt_counter(struct printbuf *out, u64 v,
bool human_readable,
enum bch_counters_flags flags)
{
if (flags & TYPE_SECTORS)
v <<= 9;
prt_char(out, ' ');
if (human_readable)
prt_human_readable_u64(out, v);
else
prt_u64(out, v);
if (flags & TYPE_SECTORS)
prt_char(out, 'B');
}
static void fs_top(const char *path, bool human_readable) static void fs_top(const char *path, bool human_readable)
{ {
struct bchfs_handle fs = bcache_fs_open(path); struct bchfs_handle fs = bcache_fs_open(path);
@ -37,15 +55,30 @@ static void fs_top(const char *path, bool human_readable)
struct bch_ioctl_query_counters *curr = read_counters(fs, 0); struct bch_ioctl_query_counters *curr = read_counters(fs, 0);
struct bch_ioctl_query_counters *prev = NULL; struct bch_ioctl_query_counters *prev = NULL;
unsigned interval_secs = 1;
while (true) { while (true) {
sleep(1); sleep(interval_secs);
kfree(prev); kfree(prev);
prev = curr; prev = curr;
curr = read_counters(fs, 0); curr = read_counters(fs, 0);
printf("\033[2J"); CLASS(printbuf, buf)();
printf("\033[H"); /* clear terminal, move cursor to top */
printf("%-40s %8s %12s %12s\n", "", "2s", "total", "mount"); prt_printf(&buf, "\033[2J");
prt_printf(&buf, "\033[H");
printbuf_tabstop_push(&buf, 40);
printbuf_tabstop_push(&buf, 14);
printbuf_tabstop_push(&buf, 14);
printbuf_tabstop_push(&buf, 14);
prt_printf(&buf,
"All counters have a corresponding tracepoint; for more info on any given event, try e.g.\n"
" perf trace -e bcachefs:data_update_pred\n"
"\n");
prt_printf(&buf, "\t%us\rtotal\rmount\r\n", interval_secs);
for (unsigned i = 0; i < BCH_COUNTER_NR; i++) { for (unsigned i = 0; i < BCH_COUNTER_NR; i++) {
unsigned stable = counters_to_stable_map[i]; unsigned stable = counters_to_stable_map[i];
@ -62,11 +95,22 @@ static void fs_top(const char *path, bool human_readable)
if (!v3) if (!v3)
continue; continue;
printf("%-40s %8llu %12llu %12llu\n", prt_printf(&buf, "%s\t", bch2_counter_names[i]);
bch2_counter_names[i],
v1, v2, v3); prt_counter(&buf, v1 / interval_secs, human_readable, bch2_counter_flags[i]);
prt_str(&buf, "/sec");
prt_tab_rjust(&buf);
prt_counter(&buf, v2, human_readable, bch2_counter_flags[i]);
prt_tab_rjust(&buf);
prt_counter(&buf, v3, human_readable, bch2_counter_flags[i]);
prt_tab_rjust(&buf);
prt_newline(&buf);
} }
write(STDOUT_FILENO, buf.buf, buf.pos);
/* XXX: include btree cache size, key cache size, total ram size */ /* XXX: include btree cache size, key cache size, total ram size */
} }