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

cmd_list_journal: Highlight entries matching transaction filter

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2023-02-21 17:21:18 -05:00
parent c67ea7b6a1
commit de720eaa24
1 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
cmd_list_journal.c
View File

@ -16,6 +16,9 @@
#include "libbcachefs/journal_seq_blacklist.h" #include "libbcachefs/journal_seq_blacklist.h"
#include "libbcachefs/super.h" #include "libbcachefs/super.h"
static const char *NORMAL = "\x1B[0m";
static const char *RED = "\x1B[31m";
static void list_journal_usage(void) static void list_journal_usage(void)
{ {
puts("bcachefs list_journal - print contents of journal\n" puts("bcachefs list_journal - print contents of journal\n"
@ -70,6 +73,22 @@ static bool bkey_matches_filter(d_bbpos filter, struct jset_entry *entry, struct
return false; return false;
} }
static bool entry_matches_transaction_filter(struct jset_entry *entry,
d_bbpos filter)
{
if (entry->type == BCH_JSET_ENTRY_btree_root ||
entry->type == BCH_JSET_ENTRY_btree_keys ||
entry->type == BCH_JSET_ENTRY_overwrite) {
struct bkey_i *k;
vstruct_for_each(entry, k)
if (bkey_matches_filter(filter, entry, k))
return true;
}
return false;
}
static bool should_print_transaction(struct jset_entry *entry, struct jset_entry *end, static bool should_print_transaction(struct jset_entry *entry, struct jset_entry *end,
d_bbpos filter) d_bbpos filter)
{ {
@ -78,16 +97,9 @@ static bool should_print_transaction(struct jset_entry *entry, struct jset_entry
for (entry = vstruct_next(entry); for (entry = vstruct_next(entry);
entry != end && !entry_is_transaction_start(entry); entry != end && !entry_is_transaction_start(entry);
entry = vstruct_next(entry)) { entry = vstruct_next(entry))
if (entry->type == BCH_JSET_ENTRY_btree_root || if (entry_matches_transaction_filter(entry, filter))
entry->type == BCH_JSET_ENTRY_btree_keys) { return true;
struct bkey_i *k;
vstruct_for_each(entry, k)
if (bkey_matches_filter(filter, entry, k))
return true;
}
}
return false; return false;
} }
@ -177,16 +189,24 @@ static void journal_entries_print(struct bch_fs *c, unsigned nr_entries,
prt_newline(&buf); prt_newline(&buf);
} }
if (should_print_entry(entry, key_filter)) { if (!should_print_entry(entry, key_filter))
printbuf_indent_add(&buf, 4); goto next;
bch2_journal_entry_to_text(&buf, c, entry);
if (blacklisted) bool highlight = entry_matches_transaction_filter(entry, transaction_filter);
star_start_of_lines(buf.buf); if (highlight)
printf("%s\n", buf.buf); fputs(RED, stdout);
printbuf_reset(&buf);
}
printbuf_indent_add(&buf, 4);
bch2_journal_entry_to_text(&buf, c, entry);
if (blacklisted)
star_start_of_lines(buf.buf);
printf("%s\n", buf.buf);
printbuf_reset(&buf);
if (highlight)
fputs(NORMAL, stdout);
next:
entry = vstruct_next(entry); entry = vstruct_next(entry);
} }
} }