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

Update bcachefs sources to e318fabeb4 bcachefs: Fix pr_tab_rjust()

Browse Source
This commit is contained in:
Kent Overstreet 2022-03-06 14:07:16 -05:00
parent b797b087a9
commit 3e2e3d468e
3 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
259ff916050fb6a9ff742891fb8aa379924a187f e318fabeb424d4b8fdd46329125c30aaa4f9006a

37
libbcachefs/util.c
View File

@ -101,8 +101,14 @@ STRTO_H(strtou64, u64)
static int bch2_printbuf_realloc(struct printbuf *out, unsigned extra) static int bch2_printbuf_realloc(struct printbuf *out, unsigned extra)
{ {
unsigned new_size = roundup_pow_of_two(out->size + extra); unsigned new_size;
char *buf = krealloc(out->buf, new_size, !out->atomic ? GFP_KERNEL : GFP_ATOMIC); char *buf;
if (out->pos + extra + 1 < out->size)
return 0;
new_size = roundup_pow_of_two(out->size + extra);
buf = krealloc(out->buf, new_size, !out->atomic ? GFP_KERNEL : GFP_ATOMIC);
if (!buf) { if (!buf) {
out->allocation_failure = true; out->allocation_failure = true;
@ -131,6 +137,33 @@ void bch2_pr_buf(struct printbuf *out, const char *fmt, ...)
out->pos += len; out->pos += len;
} }
void bch2_pr_tab_rjust(struct printbuf *buf)
{
BUG_ON(buf->tabstop > ARRAY_SIZE(buf->tabstops));
if (printbuf_linelen(buf) < buf->tabstops[buf->tabstop]) {
unsigned move = buf->pos - buf->last_field;
unsigned shift = buf->tabstops[buf->tabstop] -
printbuf_linelen(buf);
bch2_printbuf_realloc(buf, shift);
if (buf->last_field + shift + 1 < buf->size) {
move = min(move, buf->size - 1 - buf->last_field - shift);
memmove(buf->buf + buf->last_field + shift,
buf->buf + buf->last_field,
move);
memset(buf->buf + buf->last_field, ' ', shift);
buf->pos += shift;
buf->buf[buf->pos] = 0;
}
}
buf->last_field = buf->pos;
buf->tabstop++;
}
void bch2_hprint(struct printbuf *buf, s64 v) void bch2_hprint(struct printbuf *buf, s64 v)
{ {
int u, t = 0; int u, t = 0;

22
libbcachefs/util.h
View File

@ -334,27 +334,11 @@ static inline void pr_tab(struct printbuf *buf)
buf->tabstop++; buf->tabstop++;
} }
void bch2_pr_tab_rjust(struct printbuf *);
static inline void pr_tab_rjust(struct printbuf *buf) static inline void pr_tab_rjust(struct printbuf *buf)
{ {
ssize_t shift = min_t(ssize_t, buf->tabstops[buf->tabstop] - bch2_pr_tab_rjust(buf);
printbuf_linelen(buf),
printbuf_remaining(buf));
ssize_t move = min_t(ssize_t, buf->pos - buf->last_field,
printbuf_remaining(buf) - shift);
BUG_ON(buf->tabstop > ARRAY_SIZE(buf->tabstops));
if (shift > 0) {
memmove(buf->buf + buf->last_field + shift,
buf->buf + buf->last_field,
move);
memset(buf->buf + buf->last_field, ' ', shift);
buf->pos += shift;
buf->buf[buf->pos] = 0;
}
buf->last_field = buf->pos;
buf->tabstop++;
} }
void bch2_pr_units(struct printbuf *, s64, s64); void bch2_pr_units(struct printbuf *, s64, s64);