OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

utils: provide size_to_str()

Browse Source 
Moving the algorithm from print_type_size() into size_to_str() so that
other component can also leverage it. With that, refactor
print_type_size().

The assert() in that logic is removed though, since even UINT64_MAX
would not overflow.

Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <1494562661-9063-3-git-send-email-peterx@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Peter Xu 2017-05-12 12:17:40 +08:00 committed by Dr. David Alan Gilbert
parent 99e15582de
commit 22951aaaeb
3 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/qemu-common.h
View File

@ -145,6 +145,7 @@ void qemu_hexdump(const char *buf, FILE *fp, const char *prefix, size_t size);
int parse_debug_env(const char *name, int max, int initial); int parse_debug_env(const char *name, int max, int initial);
const char *qemu_ether_ntoa(const MACAddr *mac); const char *qemu_ether_ntoa(const MACAddr *mac);
char *size_to_str(uint64_t val);
void page_size_init(void); void page_size_init(void);
/* returns non-zero if dump is in progress, otherwise zero is /* returns non-zero if dump is in progress, otherwise zero is

22
qapi/string-output-visitor.c
View File

@ -211,10 +211,8 @@ static void print_type_size(Visitor *v, const char *name, uint64_t *obj,
Error **errp) Error **errp)
{ {
StringOutputVisitor *sov = to_sov(v); StringOutputVisitor *sov = to_sov(v);
static const char suffixes[] = { 'B', 'K', 'M', 'G', 'T', 'P', 'E' }; uint64_t val;
uint64_t div, val; char *out, *psize;
char *out;
int i;
if (!sov->human) { if (!sov->human) {
out = g_strdup_printf("%"PRIu64, *obj); out = g_strdup_printf("%"PRIu64, *obj);
@ -223,19 +221,11 @@ static void print_type_size(Visitor *v, const char *name, uint64_t *obj,
} }
val = *obj; val = *obj;
psize = size_to_str(val);
/* The exponent (returned in i) minus one gives us out = g_strdup_printf("%"PRIu64" (%s)", val, psize);
* floor(log2(val * 1024 / 1000). The correction makes us
* switch to the higher power when the integer part is >= 1000.
*/
frexp(val / (1000.0 / 1024.0), &i);
i = (i - 1) / 10;
assert(i < ARRAY_SIZE(suffixes));
div = 1ULL << (i * 10);
out = g_strdup_printf("%"PRIu64" (%0.3g %c%s)", val,
(double)val/div, suffixes[i], i ? "iB" : "");
string_output_set(sov, out); string_output_set(sov, out);
g_free(psize);
} }
static void print_type_bool(Visitor *v, const char *name, bool *obj, static void print_type_bool(Visitor *v, const char *name, bool *obj,

25
util/cutils.c
View File

@ -619,3 +619,28 @@ const char *qemu_ether_ntoa(const MACAddr *mac)
return ret; return ret;
} }
/*
* Return human readable string for size @val.
* @val can be anything that uint64_t allows (no more than "16 EiB").
* Use IEC binary units like KiB, MiB, and so forth.
* Caller is responsible for passing it to g_free().
*/
char *size_to_str(uint64_t val)
{
static const char *suffixes[] = { "", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei" };
unsigned long div;
int i;
/*
* The exponent (returned in i) minus one gives us
* floor(log2(val * 1024 / 1000). The correction makes us
* switch to the higher power when the integer part is >= 1000.
* (see e41b509d68afb1f for more info)
*/
frexp(val / (1000.0 / 1024.0), &i);
i = (i - 1) / 10;
div = 1ULL << (i * 10);
return g_strdup_printf("%0.3g %sB", (double)val / div, suffixes[i]);
}