From aa89266900cbc7f9a89cf8480d1178855524af60 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 17 Jun 2019 16:08:24 +0900 Subject: [PATCH] util: introduce format_bytes_full() And move it into format-util.c. --- src/basic/format-util.c | 57 ++++++++++++++++++++++++++++++++++++ src/basic/format-util.h | 13 ++++++++ src/basic/parse-util.c | 41 -------------------------- src/basic/parse-util.h | 3 -- src/import/import-fs.c | 2 +- src/import/pull-job.c | 1 + src/journal/journal-file.c | 2 +- src/journal/journal-vacuum.c | 2 +- src/journal/journalctl.c | 1 + src/test/test-btrfs.c | 2 +- src/test/test-procfs-util.c | 2 +- 11 files changed, 77 insertions(+), 49 deletions(-) diff --git a/src/basic/format-util.c b/src/basic/format-util.c index 39ef2fceefb..66551f75266 100644 --- a/src/basic/format-util.c +++ b/src/basic/format-util.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ +#include + #include "format-util.h" #include "memory-util.h" @@ -8,3 +10,58 @@ char *format_ifname(int ifindex, char buf[static IF_NAMESIZE + 1]) { memzero(buf, IF_NAMESIZE + 1); return if_indextoname(ifindex, buf); } + +char *format_bytes_full(char *buf, size_t l, uint64_t t, FormatBytesFlag flag) { + typedef struct { + const char *suffix; + uint64_t factor; + } suffix_table; + static const suffix_table table_iec[] = { + { "E", UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024) }, + { "P", UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024) }, + { "T", UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024) }, + { "G", UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024) }, + { "M", UINT64_C(1024)*UINT64_C(1024) }, + { "K", UINT64_C(1024) }, + }, table_non_iec[] = { + { "E", UINT64_C(1000)*UINT64_C(1000)*UINT64_C(1000)*UINT64_C(1000)*UINT64_C(1000)*UINT64_C(1000) }, + { "P", UINT64_C(1000)*UINT64_C(1000)*UINT64_C(1000)*UINT64_C(1000)*UINT64_C(1000) }, + { "T", UINT64_C(1000)*UINT64_C(1000)*UINT64_C(1000)*UINT64_C(1000) }, + { "G", UINT64_C(1000)*UINT64_C(1000)*UINT64_C(1000) }, + { "M", UINT64_C(1000)*UINT64_C(1000) }, + { "K", UINT64_C(1000) }, + }; + const suffix_table *table; + size_t i; + + assert_cc(ELEMENTSOF(table_iec) == ELEMENTSOF(table_non_iec)); + + if (t == (uint64_t) -1) + return NULL; + + table = flag & FORMAT_BYTES_USE_IEC ? table_iec : table_non_iec; + + for (i = 0; i < ELEMENTSOF(table_iec); i++) + if (t >= table[i].factor) { + if (flag & FORMAT_BYTES_BELOW_POINT) + snprintf(buf, l, + "%" PRIu64 ".%" PRIu64 "%s", + t / table[i].factor, + ((t*UINT64_C(10)) / table[i].factor) % UINT64_C(10), + table[i].suffix); + else + snprintf(buf, l, + "%" PRIu64 "%s", + t / table[i].factor, + table[i].suffix); + + goto finish; + } + + snprintf(buf, l, "%" PRIu64 "%s", t, flag & FORMAT_BYTES_TRAILING_B ? "B" : ""); + +finish: + buf[l-1] = 0; + return buf; + +} diff --git a/src/basic/format-util.h b/src/basic/format-util.h index 9925a5e9918..e0d184a5419 100644 --- a/src/basic/format-util.h +++ b/src/basic/format-util.h @@ -3,6 +3,7 @@ #include #include +#include #if SIZEOF_PID_T == 4 # define PID_PRI PRIi32 @@ -68,3 +69,15 @@ #endif char *format_ifname(int ifindex, char buf[static IF_NAMESIZE + 1]); + +typedef enum { + FORMAT_BYTES_USE_IEC = 1 << 0, + FORMAT_BYTES_BELOW_POINT = 1 << 1, + FORMAT_BYTES_TRAILING_B = 1 << 2, +} FormatBytesFlag; + +#define FORMAT_BYTES_MAX 8 +char *format_bytes_full(char *buf, size_t l, uint64_t t, FormatBytesFlag flag); +static inline char *format_bytes(char *buf, size_t l, uint64_t t) { + return format_bytes_full(buf, l, t, FORMAT_BYTES_USE_IEC | FORMAT_BYTES_BELOW_POINT | FORMAT_BYTES_TRAILING_B); +} diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c index 7774e794d43..115a1494a26 100644 --- a/src/basic/parse-util.c +++ b/src/basic/parse-util.c @@ -362,47 +362,6 @@ int parse_syscall_and_errno(const char *in, char **name, int *error) { return 0; } -char *format_bytes(char *buf, size_t l, uint64_t t) { - unsigned i; - - /* This only does IEC units so far */ - - static const struct { - const char *suffix; - uint64_t factor; - } table[] = { - { "E", UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024) }, - { "P", UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024) }, - { "T", UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024) }, - { "G", UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024) }, - { "M", UINT64_C(1024)*UINT64_C(1024) }, - { "K", UINT64_C(1024) }, - }; - - if (t == (uint64_t) -1) - return NULL; - - for (i = 0; i < ELEMENTSOF(table); i++) { - - if (t >= table[i].factor) { - snprintf(buf, l, - "%" PRIu64 ".%" PRIu64 "%s", - t / table[i].factor, - ((t*UINT64_C(10)) / table[i].factor) % UINT64_C(10), - table[i].suffix); - - goto finish; - } - } - - snprintf(buf, l, "%" PRIu64 "B", t); - -finish: - buf[l-1] = 0; - return buf; - -} - int safe_atou_full(const char *s, unsigned base, unsigned *ret_u) { char *x = NULL; unsigned long l; diff --git a/src/basic/parse-util.h b/src/basic/parse-util.h index 5a05dfeac55..3a70b792766 100644 --- a/src/basic/parse-util.h +++ b/src/basic/parse-util.h @@ -22,9 +22,6 @@ int parse_range(const char *t, unsigned *lower, unsigned *upper); int parse_errno(const char *t); int parse_syscall_and_errno(const char *in, char **name, int *error); -#define FORMAT_BYTES_MAX 8 -char *format_bytes(char *buf, size_t l, uint64_t t); - int safe_atou_full(const char *s, unsigned base, unsigned *ret_u); static inline int safe_atou(const char *s, unsigned *ret_u) { diff --git a/src/import/import-fs.c b/src/import/import-fs.c index 04344492c86..abb4efac999 100644 --- a/src/import/import-fs.c +++ b/src/import/import-fs.c @@ -6,13 +6,13 @@ #include "alloc-util.h" #include "btrfs-util.h" #include "fd-util.h" +#include "format-util.h" #include "fs-util.h" #include "hostname-util.h" #include "import-common.h" #include "import-util.h" #include "machine-image.h" #include "mkdir.h" -#include "parse-util.h" #include "ratelimit.h" #include "rm-rf.h" #include "string-util.h" diff --git a/src/import/pull-job.c b/src/import/pull-job.c index 9f759a77e09..881bba0eebc 100644 --- a/src/import/pull-job.c +++ b/src/import/pull-job.c @@ -6,6 +6,7 @@ #include "alloc-util.h" #include "fd-util.h" +#include "format-util.h" #include "gcrypt-util.h" #include "hexdecoct.h" #include "import-util.h" diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index c2dcf76deb8..91ca53e5ebe 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -17,13 +17,13 @@ #include "chattr-util.h" #include "compress.h" #include "fd-util.h" +#include "format-util.h" #include "fs-util.h" #include "journal-authenticate.h" #include "journal-def.h" #include "journal-file.h" #include "lookup3.h" #include "memory-util.h" -#include "parse-util.h" #include "path-util.h" #include "random-util.h" #include "set.h" diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c index a932314e19e..87d65896c61 100644 --- a/src/journal/journal-vacuum.c +++ b/src/journal/journal-vacuum.c @@ -9,11 +9,11 @@ #include "alloc-util.h" #include "dirent-util.h" #include "fd-util.h" +#include "format-util.h" #include "fs-util.h" #include "journal-def.h" #include "journal-file.h" #include "journal-vacuum.h" -#include "parse-util.h" #include "sort-util.h" #include "string-util.h" #include "time-util.h" diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 3d053c59f00..a3eb61e0f12 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -35,6 +35,7 @@ #include "device-private.h" #include "fd-util.h" #include "fileio.h" +#include "format-util.h" #include "fs-util.h" #include "fsprg.h" #include "glob-util.h" diff --git a/src/test/test-btrfs.c b/src/test/test-btrfs.c index 5e5638cd72d..5bd0e3458c4 100644 --- a/src/test/test-btrfs.c +++ b/src/test/test-btrfs.c @@ -5,8 +5,8 @@ #include "btrfs-util.h" #include "fd-util.h" #include "fileio.h" +#include "format-util.h" #include "log.h" -#include "parse-util.h" #include "string-util.h" #include "util.h" diff --git a/src/test/test-procfs-util.c b/src/test/test-procfs-util.c index 1d0612985bf..662688e0f0d 100644 --- a/src/test/test-procfs-util.c +++ b/src/test/test-procfs-util.c @@ -2,8 +2,8 @@ #include +#include "format-util.h" #include "log.h" -#include "parse-util.h" #include "procfs-util.h" int main(int argc, char *argv[]) { -- 2.39.2