From nobody Tue Feb 10 12:58:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494389082567752.718996301958; Tue, 9 May 2017 21:04:42 -0700 (PDT) Received: from localhost ([::1]:40315 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8Irh-00018h-EU for importer@patchew.org; Wed, 10 May 2017 00:04:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45195) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8Iou-0007Rq-T9 for qemu-devel@nongnu.org; Wed, 10 May 2017 00:01:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8Iou-0006Zr-2B for qemu-devel@nongnu.org; Wed, 10 May 2017 00:01:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47166) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d8Iot-0006YY-Pc for qemu-devel@nongnu.org; Wed, 10 May 2017 00:01:47 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8F3738047C for ; Wed, 10 May 2017 04:01:46 +0000 (UTC) Received: from pxdev.xzpeter.org.com (vpn1-5-83.pek2.redhat.com [10.72.5.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0D0C47EFEA; Wed, 10 May 2017 04:01:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8F3738047C Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=peterx@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 8F3738047C From: Peter Xu To: qemu-devel@nongnu.org Date: Wed, 10 May 2017 12:01:28 +0800 Message-Id: <1494388889-3558-3-git-send-email-peterx@redhat.com> In-Reply-To: <1494388889-3558-1-git-send-email-peterx@redhat.com> References: <1494388889-3558-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 10 May 2017 04:01:46 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 2/3] utils: provide size_to_str() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Markus Armbruster , peterx@redhat.com, "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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(). Signed-off-by: Peter Xu --- include/qemu-common.h | 1 + qapi/string-output-visitor.c | 22 ++++++---------------- util/cutils.c | 23 +++++++++++++++++++++++ 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/include/qemu-common.h b/include/qemu-common.h index d218821..d7d0448 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -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); =20 const char *qemu_ether_ntoa(const MACAddr *mac); +char *size_to_str(double val); void page_size_init(void); =20 /* returns non-zero if dump is in progress, otherwise zero is diff --git a/qapi/string-output-visitor.c b/qapi/string-output-visitor.c index 94ac821..53c2175 100644 --- a/qapi/string-output-visitor.c +++ b/qapi/string-output-visitor.c @@ -211,10 +211,8 @@ static void print_type_size(Visitor *v, const char *na= me, uint64_t *obj, Error **errp) { StringOutputVisitor *sov =3D to_sov(v); - static const char suffixes[] =3D { 'B', 'K', 'M', 'G', 'T', 'P', 'E' }; - uint64_t div, val; - char *out; - int i; + uint64_t val; + char *out, *psize; =20 if (!sov->human) { out =3D g_strdup_printf("%"PRIu64, *obj); @@ -223,19 +221,11 @@ static void print_type_size(Visitor *v, const char *n= ame, uint64_t *obj, } =20 val =3D *obj; - - /* 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 >=3D 1000. - */ - frexp(val / (1000.0 / 1024.0), &i); - i =3D (i - 1) / 10; - assert(i < ARRAY_SIZE(suffixes)); - div =3D 1ULL << (i * 10); - - out =3D g_strdup_printf("%"PRIu64" (%0.3g %c%s)", val, - (double)val/div, suffixes[i], i ? "iB" : ""); + psize =3D size_to_str(val); + out =3D g_strdup_printf("%"PRIu64" (%s)", val, psize); string_output_set(sov, out); + + g_free(psize); } =20 static void print_type_bool(Visitor *v, const char *name, bool *obj, diff --git a/util/cutils.c b/util/cutils.c index 50ad179..c562d87 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -619,3 +619,26 @@ const char *qemu_ether_ntoa(const MACAddr *mac) =20 return ret; } + +/* + * Please free the buffer after use. + */ +char *size_to_str(double val) +{ + static const char *suffixes[] =3D { "", "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 >=3D 1000. + * (see e41b509d68afb1f for more info) + */ + frexp(val / (1000.0 / 1024.0), &i); + i =3D (i - 1) / 10; + assert(i < ARRAY_SIZE(suffixes)); + div =3D 1ULL << (i * 10); + + return g_strdup_printf("%0.3g %sB", val / div, suffixes[i]); +} --=20 2.7.4