[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 48/48] qapi: Refine human printing of sizes
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 48/48] qapi: Refine human printing of sizes |
Date: |
Mon, 10 Feb 2014 19:37:05 +0100 |
From: Paolo Bonzini <address@hidden>
This fixes several bugs or shortcomings of the previous pretty-printer.
In particular:
* use PRIu64 instead of casting to long long
* the exact value is included too
* the correct unit of measure (MiB, GiB, etc.) is used. PiB and EiB
are added too.
* due to an off-by-one error, 512*2^30 was printed as 0.500MiB rather than
512MiB. floor(log2(val)) is equal to 63 - clz(val), while the code used 64.
* The desired specification is %g rather than %f, which always uses three
decimals in the current code. However %g would switch to scientific
notation when the integer part is >= 1000 (e.g. 1000*2^30). To keep the
code simple, switch to the higher power when the integer part is >= 1000;
overflow is avoided by using frexp instead of clz.
Suggested-by: Eric Blake <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
qapi/string-output-visitor.c | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/qapi/string-output-visitor.c b/qapi/string-output-visitor.c
index 67a8798..fb1d2e8 100644
--- a/qapi/string-output-visitor.c
+++ b/qapi/string-output-visitor.c
@@ -15,6 +15,7 @@
#include "qapi/visitor-impl.h"
#include "qapi/qmp/qerror.h"
#include "qemu/host-utils.h"
+#include <math.h>
struct StringOutputVisitor
{
@@ -47,30 +48,30 @@ static void print_type_size(Visitor *v, uint64_t *obj,
const char *name,
Error **errp)
{
StringOutputVisitor *sov = DO_UPCAST(StringOutputVisitor, visitor, v);
- static const char suffixes[] = { 'B', 'K', 'M', 'G', 'T' };
+ static const char suffixes[] = { 'B', 'K', 'M', 'G', 'T', 'P', 'E' };
uint64_t div, val;
char *out;
int i;
if (!sov->human) {
- out = g_strdup_printf("%llu", (long long) *obj);
+ out = g_strdup_printf("%"PRIu64, *obj);
string_output_set(sov, out);
return;
}
val = *obj;
- /* Compute floor(log2(val)). */
- i = 64 - clz64(val);
-
- /* Find the power of 1024 that we'll display as the units. */
- i /= 10;
- if (i >= ARRAY_SIZE(suffixes)) {
- i = ARRAY_SIZE(suffixes) - 1;
- }
+ /* 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.
+ */
+ frexp(val / (1000.0 / 1024.0), &i);
+ i = (i - 1) / 10;
+ assert(i < ARRAY_SIZE(suffixes));
div = 1ULL << (i * 10);
- out = g_strdup_printf("%0.03f%c", (double)val/div, suffixes[i]);
+ out = g_strdup_printf("%"PRIu64" (%0.3g %c%s)", val,
+ (double)val/div, suffixes[i], i ? "iB" : "");
string_output_set(sov, out);
}
--
1.8.4.5
- Re: [Qemu-devel] [PULL 33/48] ipack: Move IndustryPack out of hw/char/, (continued)
- [Qemu-devel] [PULL 34/48] qtest: Don't segfault with invalid -qtest option, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 35/48] qapi: Add size parser to StringInputVisitor, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 39/48] qdev: Legacy properties are just strings, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 36/48] qdev: Sizes are now parsed by StringInputVisitor, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 37/48] qdev: Remove legacy parsers for hex8/32/64, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 46/48] qdev: Add enum property types to QAPI schema, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 43/48] qdev: Remove most legacy printers, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 42/48] qdev: Use human mode in "info qtree", Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 48/48] qapi: Refine human printing of sizes,
Andreas Färber <=
- [Qemu-devel] [PULL 41/48] qapi: Add human mode to StringOutputVisitor, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 45/48] block: Handle "rechs" and "large" translation options, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 38/48] qdev: Legacy properties are now read-only, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 47/48] qdev: Use QAPI type names for properties, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 40/48] qdev: Inline qdev_prop_parse(), Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 44/48] qdev: Remove hex8/32/64 property types, Andreas Färber, 2014/02/10
- Re: [Qemu-devel] [PULL 00/48] QOM devices patch queue 2014-02-10, Peter Maydell, 2014/02/15