From: Justin Tobler <jltobler@gmail•com>
To: git@vger•kernel.org
Cc: ps@pks•im, gitster@pobox•com, Justin Tobler <jltobler@gmail•com>
Subject: [PATCH v2 2/7] strbuf: split out logic to humanise byte values
Date: Fri, 12 Dec 2025 16:36:39 -0600 [thread overview]
Message-ID: <20251212223644.3090879-3-jltobler@gmail.com> (raw)
In-Reply-To: <20251212223644.3090879-1-jltobler@gmail.com>
In a subsequent commit, byte size values displayed in table output for
the git-repo(1) "structure" subcommand will be shown in a more
human-readable format with the appropriate unit prefixes. For this
usecase, the downscaled values and unit prefixes must be handled
separately to ensure proper column alignment. Refactor strbuf_humanise()
to instead append the downscaled byte value to the buffer only and
return the appropriate unit prefix string.
Signed-off-by: Justin Tobler <jltobler@gmail•com>
---
strbuf.c | 62 +++++++++++++++++++++++++-------------------------------
strbuf.h | 9 ++++++++
2 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/strbuf.c b/strbuf.c
index 6c3851a7f8..1fb47bf21b 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -836,55 +836,49 @@ void strbuf_addstr_urlencode(struct strbuf *sb, const char *s,
strbuf_add_urlencode(sb, s, strlen(s), allow_unencoded_fn);
}
-static void strbuf_humanise(struct strbuf *buf, off_t bytes,
- int humanise_rate)
+char *strbuf_humanise_bytes_value(struct strbuf *buf, off_t bytes, unsigned flags)
{
+ int humanise_rate = flags & STRBUF_HUMANISE_RATE;
+
if (bytes > 1 << 30) {
- strbuf_addf(buf,
- humanise_rate == 0 ?
- /* TRANSLATORS: IEC 80000-13:2008 gibibyte */
- _("%u.%2.2u GiB") :
- /* TRANSLATORS: IEC 80000-13:2008 gibibyte/second */
- _("%u.%2.2u GiB/s"),
- (unsigned)(bytes >> 30),
+ strbuf_addf(buf, "%u.%2.2u", (unsigned)(bytes >> 30),
(unsigned)(bytes & ((1 << 30) - 1)) / 10737419);
+ /* TRANSLATORS: IEC 80000-13:2008 gibibyte/second and gibibyte */
+ return humanise_rate ? xstrfmt(_("GiB/s")) : xstrfmt(_("GiB"));
} else if (bytes > 1 << 20) {
- unsigned x = bytes + 5243; /* for rounding */
- strbuf_addf(buf,
- humanise_rate == 0 ?
- /* TRANSLATORS: IEC 80000-13:2008 mebibyte */
- _("%u.%2.2u MiB") :
- /* TRANSLATORS: IEC 80000-13:2008 mebibyte/second */
- _("%u.%2.2u MiB/s"),
- x >> 20, ((x & ((1 << 20) - 1)) * 100) >> 20);
+ unsigned x = bytes + 5243; /* for rounding */
+ strbuf_addf(buf, "%u.%2.2u", x >> 20,
+ ((x & ((1 << 20) - 1)) * 100) >> 20);
+ /* TRANSLATORS: IEC 80000-13:2008 mebibyte/second and mebibyte */
+ return humanise_rate ? xstrfmt(_("MiB/s")) : xstrfmt(_("MiB"));
} else if (bytes > 1 << 10) {
- unsigned x = bytes + 5; /* for rounding */
- strbuf_addf(buf,
- humanise_rate == 0 ?
- /* TRANSLATORS: IEC 80000-13:2008 kibibyte */
- _("%u.%2.2u KiB") :
- /* TRANSLATORS: IEC 80000-13:2008 kibibyte/second */
- _("%u.%2.2u KiB/s"),
- x >> 10, ((x & ((1 << 10) - 1)) * 100) >> 10);
+ unsigned x = bytes + 5; /* for rounding */
+ strbuf_addf(buf, "%u.%2.2u", x >> 10,
+ ((x & ((1 << 10) - 1)) * 100) >> 10);
+ /* TRANSLATORS: IEC 80000-13:2008 kibibyte/second and kibibyte */
+ return humanise_rate ? xstrfmt(_("KiB/s")) : xstrfmt(_("KiB"));
} else {
- strbuf_addf(buf,
- humanise_rate == 0 ?
- /* TRANSLATORS: IEC 80000-13:2008 byte */
- Q_("%u byte", "%u bytes", bytes) :
- /* TRANSLATORS: IEC 80000-13:2008 byte/second */
- Q_("%u byte/s", "%u bytes/s", bytes),
- (unsigned)bytes);
+ strbuf_addf(buf, "%u", (unsigned)bytes);
+ return humanise_rate ?
+ /* TRANSLATORS: IEC 80000-13:2008 byte/second */
+ xstrfmt(Q_("byte/s", "bytes/s", bytes)) :
+ /* TRANSLATORS: IEC 80000-13:2008 byte */
+ xstrfmt(Q_("byte", "bytes", bytes));
}
}
void strbuf_humanise_bytes(struct strbuf *buf, off_t bytes)
{
- strbuf_humanise(buf, bytes, 0);
+ char *unit = strbuf_humanise_bytes_value(buf, bytes, 0);
+ strbuf_addf(buf, " %s", unit);
+ free(unit);
}
void strbuf_humanise_rate(struct strbuf *buf, off_t bytes)
{
- strbuf_humanise(buf, bytes, 1);
+ char *unit = strbuf_humanise_bytes_value(buf, bytes, STRBUF_HUMANISE_RATE);
+ strbuf_addf(buf, " %s", unit);
+ free(unit);
}
int printf_ln(const char *fmt, ...)
diff --git a/strbuf.h b/strbuf.h
index a580ac6084..a5e3ab0cb4 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -367,6 +367,15 @@ void strbuf_addbuf_percentquote(struct strbuf *dst, const struct strbuf *src);
*/
void strbuf_add_percentencode(struct strbuf *dst, const char *src, int flags);
+#define STRBUF_HUMANISE_RATE 1 << 0
+
+/**
+ * Append the given byte size as a human-readable string that is downscaled by
+ * some factor. A string with the corresponding unit prefix is returned
+ * separately.
+ */
+char *strbuf_humanise_bytes_value(struct strbuf *buf, off_t bytes, unsigned flags);
+
/**
* Append the given byte size as a human-readable string (i.e. 12.23 KiB,
* 3.50 MiB).
--
2.52.0.209.ge85ae279b0
next prev parent reply other threads:[~2025-12-12 22:36 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-09 22:58 [PATCH 0/6] builtin/repo: add object size info to structure output Justin Tobler
2025-12-09 22:58 ` [PATCH 1/6] builtin/repo: group per-type object values into struct Justin Tobler
2025-12-09 22:58 ` [PATCH 2/6] builtin/repo: humanise count values in structure output Justin Tobler
2025-12-10 6:28 ` Patrick Steinhardt
2025-12-10 15:10 ` Justin Tobler
2025-12-11 2:57 ` Junio C Hamano
2025-12-12 16:46 ` Justin Tobler
2025-12-09 22:58 ` [PATCH 3/6] builtin/repo: add inflated object info to keyvalue " Justin Tobler
2025-12-09 22:58 ` [PATCH 4/6] builtin/repo: add inflated object info to structure table Justin Tobler
2025-12-10 6:28 ` Patrick Steinhardt
2025-12-10 15:21 ` Justin Tobler
2025-12-09 22:58 ` [PATCH 5/6] builtin/repo: add disk size info to keyvalue stucture output Justin Tobler
2025-12-10 6:28 ` Patrick Steinhardt
2025-12-10 15:24 ` Justin Tobler
2025-12-12 20:40 ` Justin Tobler
2025-12-15 5:33 ` Patrick Steinhardt
2025-12-15 16:24 ` Justin Tobler
2025-12-10 14:58 ` Junio C Hamano
2025-12-10 19:09 ` Lucas Seiki Oshiro
2025-12-12 22:36 ` Justin Tobler
2025-12-12 23:58 ` Junio C Hamano
2025-12-09 22:58 ` [PATCH 6/6] builtin/repo: add object disk size info to structure table Justin Tobler
2025-12-10 6:28 ` Patrick Steinhardt
2025-12-10 15:24 ` Justin Tobler
2025-12-12 22:36 ` [PATCH v2 0/7] builtin/repo: add object size info to structure output Justin Tobler
2025-12-12 22:36 ` [PATCH v2 1/7] builtin/repo: group per-type object values into struct Justin Tobler
2025-12-12 22:36 ` Justin Tobler [this message]
2025-12-15 5:33 ` [PATCH v2 2/7] strbuf: split out logic to humanise byte values Patrick Steinhardt
2025-12-15 16:26 ` Justin Tobler
2025-12-15 8:21 ` Junio C Hamano
2025-12-15 16:47 ` Justin Tobler
2025-12-16 2:26 ` Jiang Xin
2025-12-16 4:37 ` Junio C Hamano
2025-12-16 6:18 ` Jiang Xin
2025-12-16 14:41 ` Justin Tobler
2025-12-12 22:36 ` [PATCH v2 3/7] builtin/repo: humanise count values in structure output Justin Tobler
2025-12-15 5:33 ` Patrick Steinhardt
2025-12-12 22:36 ` [PATCH v2 4/7] builtin/repo: add inflated object info to keyvalue " Justin Tobler
2025-12-15 5:33 ` Patrick Steinhardt
2025-12-15 16:48 ` Justin Tobler
2025-12-12 22:36 ` [PATCH v2 5/7] builtin/repo: add inflated object info to structure table Justin Tobler
2025-12-12 22:36 ` [PATCH v2 6/7] builtin/repo: add disk size info to keyvalue stucture output Justin Tobler
2025-12-15 5:33 ` Patrick Steinhardt
2025-12-12 22:36 ` [PATCH v2 7/7] builtin/repo: add object disk size info to structure table Justin Tobler
2025-12-15 20:56 ` [PATCH v3 0/7] builtin/repo: add object size info to structure output Justin Tobler
2025-12-15 20:56 ` [PATCH v3 1/7] builtin/repo: group per-type object values into struct Justin Tobler
2025-12-15 20:56 ` [PATCH v3 2/7] strbuf: split out logic to humanise byte values Justin Tobler
2025-12-16 1:19 ` Junio C Hamano
2025-12-16 1:36 ` Justin Tobler
2025-12-15 20:56 ` [PATCH v3 3/7] builtin/repo: humanise count values in structure output Justin Tobler
2025-12-16 8:25 ` Patrick Steinhardt
2025-12-15 20:56 ` [PATCH v3 4/7] builtin/repo: add inflated object info to keyvalue " Justin Tobler
2025-12-15 20:56 ` [PATCH v3 5/7] builtin/repo: add inflated object info to structure table Justin Tobler
2025-12-15 20:56 ` [PATCH v3 6/7] builtin/repo: add disk size info to keyvalue stucture output Justin Tobler
2025-12-15 20:56 ` [PATCH v3 7/7] builtin/repo: add object disk size info to structure table Justin Tobler
2025-12-16 8:25 ` Patrick Steinhardt
2025-12-16 14:48 ` Justin Tobler
2025-12-16 17:38 ` [PATCH v4 0/7] builtin/repo: add object size info to structure output Justin Tobler
2025-12-16 17:38 ` [PATCH v4 1/7] builtin/repo: group per-type object values into struct Justin Tobler
2025-12-16 17:38 ` [PATCH v4 2/7] strbuf: split out logic to humanise byte values Justin Tobler
2025-12-16 18:59 ` Junio C Hamano
2025-12-16 19:39 ` Justin Tobler
2025-12-16 17:38 ` [PATCH v4 3/7] builtin/repo: humanise count values in structure output Justin Tobler
2025-12-16 17:38 ` [PATCH v4 4/7] builtin/repo: add inflated object info to keyvalue " Justin Tobler
2025-12-17 7:03 ` Patrick Steinhardt
2025-12-17 16:10 ` Justin Tobler
2025-12-16 17:38 ` [PATCH v4 5/7] builtin/repo: add inflated object info to structure table Justin Tobler
2025-12-16 17:38 ` [PATCH v4 6/7] builtin/repo: add disk size info to keyvalue stucture output Justin Tobler
2025-12-16 17:38 ` [PATCH v4 7/7] builtin/repo: add object disk size info to structure table Justin Tobler
2025-12-17 7:03 ` [PATCH v4 0/7] builtin/repo: add object size info to structure output Patrick Steinhardt
2025-12-17 17:49 ` Justin Tobler
2025-12-17 17:53 ` [PATCH v5 " Justin Tobler
2025-12-17 17:53 ` [PATCH v5 1/7] builtin/repo: group per-type object values into struct Justin Tobler
2025-12-17 17:53 ` [PATCH v5 2/7] strbuf: split out logic to humanise byte values Justin Tobler
2025-12-17 17:54 ` [PATCH v5 3/7] builtin/repo: humanise count values in structure output Justin Tobler
2025-12-17 17:54 ` [PATCH v5 4/7] builtin/repo: add inflated object info to keyvalue " Justin Tobler
2025-12-17 17:54 ` [PATCH v5 5/7] builtin/repo: add inflated object info to structure table Justin Tobler
2025-12-17 17:54 ` [PATCH v5 6/7] builtin/repo: add disk size info to keyvalue stucture output Justin Tobler
2025-12-17 17:54 ` [PATCH v5 7/7] builtin/repo: add object disk size info to structure table Justin Tobler
2025-12-18 6:32 ` [PATCH v5 0/7] builtin/repo: add object size info to structure output Patrick Steinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251212223644.3090879-3-jltobler@gmail.com \
--to=jltobler@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=ps@pks$(echo .)im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox