emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[disk_units] tweak rounding

Browse Source
This commit is contained in:
Joe Thornber 2016-01-20 09:50:47 +00:00
parent 944b9c0c57
commit d19164a177
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
base/disk_units.cc
View File

@ -53,13 +53,35 @@ base::disk_unit_multiplier(disk_unit u)
return 1; return 1;
} }
namespace {
bool small_enough(unsigned long long n) {
if (n > 1024ull * 1024ull)
return false;
if (n < 1024ull)
return true;
return (n & 1023) && (n < 8ull * 1024ull);
}
unsigned long long round_ull(unsigned long long n, unsigned long long d) {
return round(static_cast<double>(n) / static_cast<double>(d));
}
}
string string
base::format_disk_unit(unsigned long long numerator, disk_unit u) base::format_disk_unit(unsigned long long numerator, disk_unit u)
{ {
numerator *= disk_unit_multiplier(u); numerator *= disk_unit_multiplier(u);
unsigned i; unsigned i;
for (i = 0; numerator >= 1024; i++) for (i = 0; numerator > 1024ull * 1024ull; i++)
numerator /= 1024; numerator /= 1024ull;
if (numerator > 8 * 1024ull) {
numerator = round_ull(numerator, 1024ull);
i++;
}
char const *extensions[] = { char const *extensions[] = {
"", "KiB", "MiB", "GiB", "TiB", "PiB" "", "KiB", "MiB", "GiB", "TiB", "PiB"