Commit e7bc7cdf authored by Kent Overstreet's avatar Kent Overstreet Committed by Kent Overstreet

bcachefs: Improve journal_entry_btree_keys_to_text()

This improves the formatting of journal_entry_btree_keys_to_text() by
putting each key on its own line.
Signed-off-by: default avatarKent Overstreet <kent.overstreet@gmail.com>
parent 33aa419d
...@@ -298,11 +298,17 @@ static void journal_entry_btree_keys_to_text(struct printbuf *out, struct bch_fs ...@@ -298,11 +298,17 @@ static void journal_entry_btree_keys_to_text(struct printbuf *out, struct bch_fs
struct jset_entry *entry) struct jset_entry *entry)
{ {
struct bkey_i *k; struct bkey_i *k;
bool first = true;
vstruct_for_each(entry, k) {
if (!first) {
printbuf_newline(out);
pr_buf(out, "%s: ", bch2_jset_entry_types[entry->type]);
}
pr_buf(out, "btree=%s l=%u ", bch2_btree_ids[entry->btree_id], entry->level); pr_buf(out, "btree=%s l=%u ", bch2_btree_ids[entry->btree_id], entry->level);
vstruct_for_each(entry, k)
bch2_bkey_val_to_text(out, c, bkey_i_to_s_c(k)); bch2_bkey_val_to_text(out, c, bkey_i_to_s_c(k));
first = false;
}
} }
static int journal_entry_btree_root_validate(struct bch_fs *c, static int journal_entry_btree_root_validate(struct bch_fs *c,
......
...@@ -238,6 +238,7 @@ do { \ ...@@ -238,6 +238,7 @@ do { \
struct printbuf { struct printbuf {
char *pos; char *pos;
char *end; char *end;
unsigned indent;
}; };
static inline size_t printbuf_remaining(struct printbuf *buf) static inline size_t printbuf_remaining(struct printbuf *buf)
...@@ -259,6 +260,27 @@ do { \ ...@@ -259,6 +260,27 @@ do { \
__VA_ARGS__); \ __VA_ARGS__); \
} while (0) } while (0)
static inline void printbuf_indent_push(struct printbuf *buf, unsigned spaces)
{
buf->indent += spaces;
while (spaces--)
pr_buf(buf, " ");
}
static inline void printbuf_indent_pop(struct printbuf *buf, unsigned spaces)
{
buf->indent -= spaces;
}
static inline void printbuf_newline(struct printbuf *buf)
{
unsigned i;
pr_buf(buf, "\n");
for (i = 0; i < buf->indent; i++)
pr_buf(buf, " ");
}
void bch_scnmemcpy(struct printbuf *, const char *, size_t); void bch_scnmemcpy(struct printbuf *, const char *, size_t);
int bch2_strtoint_h(const char *, int *); int bch2_strtoint_h(const char *, int *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment