|
 |
26ccd9 |
From e1c629bb3e01e3df24c189c0ecabde37788139a2 Mon Sep 17 00:00:00 2001
|
|
|
26ccd9 |
From: Dan Williams <dan.j.williams@intel.com>
|
|
|
26ccd9 |
Date: Thu, 28 Apr 2022 15:10:11 -0700
|
|
|
26ccd9 |
Subject: [PATCH 156/217] util: Use SZ_ size macros in display size
|
|
|
26ccd9 |
|
|
|
26ccd9 |
In preparation for adding "Terabyte" support, cleanup the "1024"
|
|
|
26ccd9 |
multiplication with the SZ_* macros.
|
|
|
26ccd9 |
|
|
|
26ccd9 |
Link: https://lore.kernel.org/r/165118381109.1676208.8857362319985041575.stgit@dwillia2-desk3.amr.corp.intel.com
|
|
|
26ccd9 |
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
|
|
|
26ccd9 |
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
|
|
|
26ccd9 |
---
|
|
|
26ccd9 |
util/json.c | 11 ++++++-----
|
|
|
26ccd9 |
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
26ccd9 |
|
|
|
26ccd9 |
diff --git a/util/json.c b/util/json.c
|
|
|
26ccd9 |
index f8cc81f..ebdf8d9 100644
|
|
|
26ccd9 |
--- a/util/json.c
|
|
|
26ccd9 |
+++ b/util/json.c
|
|
|
26ccd9 |
@@ -5,6 +5,7 @@
|
|
|
26ccd9 |
#include <stdio.h>
|
|
|
26ccd9 |
#include <util/util.h>
|
|
|
26ccd9 |
#include <util/json.h>
|
|
|
26ccd9 |
+#include <util/size.h>
|
|
|
26ccd9 |
#include <json-c/json.h>
|
|
|
26ccd9 |
#include <json-c/printbuf.h>
|
|
|
26ccd9 |
|
|
|
26ccd9 |
@@ -27,24 +28,24 @@ static int display_size(struct json_object *jobj, struct printbuf *pbuf,
|
|
|
26ccd9 |
* If prefix == JEDEC, we mean prefixes like kilo,mega,giga etc.
|
|
|
26ccd9 |
*/
|
|
|
26ccd9 |
|
|
|
26ccd9 |
- if (bytes < 5000*1024)
|
|
|
26ccd9 |
+ if (bytes < 5000*SZ_1K)
|
|
|
26ccd9 |
snprintf(buf, sizeof(buf), "%lld", bytes);
|
|
|
26ccd9 |
else {
|
|
|
26ccd9 |
/* IEC */
|
|
|
26ccd9 |
- if (bytes < 2*1024LL*1024LL*1024LL) {
|
|
|
26ccd9 |
- long cMiB = (bytes * 200LL / (1LL<<20) +1) /2;
|
|
|
26ccd9 |
+ if (bytes < 2L*SZ_1G) {
|
|
|
26ccd9 |
+ long cMiB = (bytes * 200LL / SZ_1M+1) /2;
|
|
|
26ccd9 |
|
|
|
26ccd9 |
c = snprintf(buf, sizeof(buf), "\"%ld.%02ld MiB",
|
|
|
26ccd9 |
cMiB/100 , cMiB % 100);
|
|
|
26ccd9 |
} else {
|
|
|
26ccd9 |
- long cGiB = (bytes * 200LL / (1LL<<30) +1) /2;
|
|
|
26ccd9 |
+ long cGiB = (bytes * 200LL / SZ_1G+1) /2;
|
|
|
26ccd9 |
|
|
|
26ccd9 |
c = snprintf(buf, sizeof(buf), "\"%ld.%02ld GiB",
|
|
|
26ccd9 |
cGiB/100 , cGiB % 100);
|
|
|
26ccd9 |
}
|
|
|
26ccd9 |
|
|
|
26ccd9 |
/* JEDEC */
|
|
|
26ccd9 |
- if (bytes < 2*1024LL*1024LL*1024LL) {
|
|
|
26ccd9 |
+ if (bytes < 2L*SZ_1G) {
|
|
|
26ccd9 |
long cMB = (bytes / (1000000LL / 200LL) + 1) / 2;
|
|
|
26ccd9 |
|
|
|
26ccd9 |
snprintf(buf + c, sizeof(buf) - c, " (%ld.%02ld MB)\"",
|
|
|
26ccd9 |
--
|
|
|
26ccd9 |
2.27.0
|
|
|
26ccd9 |
|