Attachment 67167 Details for Bug 53239 – [4/6] Synchronize size calculation in human_size and human_size_readable

[patch] [4/6] Synchronize size calculation in human_size and human_size_readable

display-size-with (text/plain), 3.29 KB, created by Maciej Naruszewicz on 2012-09-14 15:26:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maciej Naruszewicz

Created: 2012-09-14 15:26:01 UTC

Size: 3.29 KB

patch

obsolete

>Display size with human_size_brief with a chosen prefix
>
>From: Maciej Naruszewicz <maciej.naruszewicz@intel.com>
>
>When using human_size_brief, only IEC prefixes were supported. Now
>it's possible to specify which format we want to see - either IEC
>(kibi, mibi, gibi) or JEDEC (kilo, mega, giga).
>
>Signed-off-by: Maciej Naruszewicz <maciej.naruszewicz@intel.com>
>---
> Query.c |    2 +-
> mdadm.h |    7 ++++++-
> util.c  |   36 +++++++++++++++++++++++++++---------
> 3 files changed, 34 insertions(+), 11 deletions(-)
>
>diff --git a/Query.c b/Query.c
>index b9c209f..329e583 100644
>--- a/Query.c
>+++ b/Query.c
>@@ -76,7 +76,7 @@ int Query(char *dev)
> 	else {
> 		printf("%s: %s %s %d devices, %d spare%s. Use mdadm --detail for more detail.\n",
> 		       dev,
>-		       human_size_brief(larray_size),
>+		       human_size_brief(larray_size,IEC),
> 		       map_num(pers, array.level),
> 		       array.raid_disks,
> 		       array.spare_disks, array.spare_disks==1?"":"s");
>diff --git a/mdadm.h b/mdadm.h
>index c5faa37..5bb2b8c 100644
>--- a/mdadm.h
>+++ b/mdadm.h
>@@ -329,6 +329,11 @@ enum special_options {
> 	ControllerPath,
> };
> 
>+enum prefix_standard {
>+	JEDEC,
>+	IEC
>+};
>+
> /* structures read from config file */
> /* List of mddevice names and identifiers
>  * Identifiers can be:
>@@ -1242,7 +1247,7 @@ extern int set_array_info(int mdfd, struct supertype *st, struct mdinfo *info);
> unsigned long long min_recovery_start(struct mdinfo *array);
> 
> extern char *human_size(long long bytes);
>-extern char *human_size_brief(long long bytes);
>+extern char *human_size_brief(long long bytes, int prefix);
> extern void print_r10_layout(int layout);
> 
> #define NoMdDev (1<<23)
>diff --git a/util.c b/util.c
>index 96ecda2..a55c725 100644
>--- a/util.c
>+++ b/util.c
>@@ -681,7 +681,7 @@ char *human_size(long long bytes)
> 	return buf;
> }
> 
>-char *human_size_brief(long long bytes)
>+char *human_size_brief(long long bytes, int prefix)
> {
> 	static char buf[30];
> 
>@@ -692,19 +692,37 @@ char *human_size_brief(long long bytes)
> 	 * gigabytes, as that shows more precision and isn't
> 	 * too large a number.
> 	 * Terabytes are not yet handled.
>+	 *
>+	 * If prefix == IEC, we mean prefixes like kibi,mebi,gibi etc.
>+	 * If prefix == JEDEC, we mean prefixes like kilo,mega,giga etc.
> 	 */
> 
> 	if (bytes < 5000*1024)
> 		buf[0] = 0;
>-	else if (bytes < 2*1024LL*1024LL*1024LL) {
>-		long cMiB = (bytes / ( (1LL<<20) / 200LL ) +1) /2;
>-		snprintf(buf, sizeof(buf), " (%ld.%02ldMiB)",
>-			cMiB/100 , cMiB % 100);
>-	} else {
>-		long cGiB = (bytes / ( (1LL<<30) / 200LL ) +1) /2;
>-		snprintf(buf, sizeof(buf), " (%ld.%02ldGiB)",
>-				cGiB/100 , cGiB % 100);
>+	else if (prefix == IEC) {
>+		if (bytes < 2*1024LL*1024LL*1024LL) {
>+			long cMiB = (bytes / ( (1LL<<20) / 200LL ) +1) /2;
>+			snprintf(buf, sizeof(buf), "%ld.%02ldMiB",
>+				cMiB/100 , cMiB % 100);
>+		} else {
>+			long cGiB = (bytes / ( (1LL<<30) / 200LL ) +1) /2;
>+			snprintf(buf, sizeof(buf), "%ld.%02ldGiB",
>+					cGiB/100 , cGiB % 100);
>+		}
>+	}
>+	else if (prefix == JEDEC) {
>+		if (bytes < 2*1024LL*1024LL*1024LL) {
>+			long cMB  = (bytes / ( 1000000LL / 200LL ) +1) /2;
>+			snprintf(buf, sizeof(buf), "%ld.%02ldMB",
>+					cMB/100, cMB % 100);
>+		} else {
>+			long cGB  = (bytes / (1000000000LL/200LL ) +1) /2;
>+			snprintf(buf, sizeof(buf), "%ld.%02ldGB",
>+					cGB/100 , cGB % 100);
>+		}
> 	}
>+	else
>+		buf[0] = 0;
> 
> 	return buf;
> }

Actions: View | Splinter Review

Attachments on bug 53239: 67039 | 67040 | 67162 | 67163 | 67164 | 67165 | 67166 | 67167 | 67168 | 67173 | 67174 | 67245

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.