Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Display size with human_size_brief with a chosen prefix 

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>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
Maciej Naruszewicz 2012-10-02 16:41:13 +10:00 committed by NeilBrown
parent 570abc6f38
commit f0ec67106c
3 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Query.c
View File

@ -76,7 +76,7 @@ int Query(char *dev)
else { else {
printf("%s: %s %s %d devices, %d spare%s. Use mdadm --detail for more detail.\n", printf("%s: %s %s %d devices, %d spare%s. Use mdadm --detail for more detail.\n",
dev, dev,
human_size_brief(larray_size), human_size_brief(larray_size,IEC),
map_num(pers, array.level), map_num(pers, array.level),
array.raid_disks, array.raid_disks,
array.spare_disks, array.spare_disks==1?"":"s"); array.spare_disks, array.spare_disks==1?"":"s");

7
mdadm.h
View File

@ -328,6 +328,11 @@ enum special_options {
KillOpt, KillOpt,
}; };
enum prefix_standard {
JEDEC,
IEC
};
/* structures read from config file */ /* structures read from config file */
/* List of mddevice names and identifiers /* List of mddevice names and identifiers
* Identifiers can be: * Identifiers can be:
@ -1240,7 +1245,7 @@ extern int set_array_info(int mdfd, struct supertype *st, struct mdinfo *info);
unsigned long long min_recovery_start(struct mdinfo *array); unsigned long long min_recovery_start(struct mdinfo *array);
extern char *human_size(long long bytes); 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); extern void print_r10_layout(int layout);
#define NoMdDev (1<<23) #define NoMdDev (1<<23)

36
util.c
View File

@ -682,7 +682,7 @@ char *human_size(long long bytes)
return buf; return buf;
} }
char *human_size_brief(long long bytes) char *human_size_brief(long long bytes, int prefix)
{ {
static char buf[30]; static char buf[30];
@ -693,19 +693,37 @@ char *human_size_brief(long long bytes)
* gigabytes, as that shows more precision and isn't * gigabytes, as that shows more precision and isn't
* too large a number. * too large a number.
* Terabytes are not yet handled. * 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) if (bytes < 5000*1024)
buf[0] = 0; buf[0] = 0;
else if (bytes < 2*1024LL*1024LL*1024LL) { else if (prefix == IEC) {
long cMiB = (bytes / ( (1LL<<20) / 200LL ) +1) /2; if (bytes < 2*1024LL*1024LL*1024LL) {
snprintf(buf, sizeof(buf), " (%ld.%02ldMiB)", long cMiB = (bytes / ( (1LL<<20) / 200LL ) +1) /2;
cMiB/100 , cMiB % 100); snprintf(buf, sizeof(buf), "%ld.%02ldMiB",
} else { cMiB/100 , cMiB % 100);
long cGiB = (bytes / ( (1LL<<30) / 200LL ) +1) /2; } else {
snprintf(buf, sizeof(buf), " (%ld.%02ldGiB)", long cGiB = (bytes / ( (1LL<<30) / 200LL ) +1) /2;
cGiB/100 , cGiB % 100); 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; return buf;
} }