Rewrite of function fBytes() in arc_summary.py

Replace if-elif-else construction with shorter loop;
remove unused parameter "Decimal"; centralize format
string; add function documentation string; conform to
PEP8.

Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Scot W. Stevenson <scot.stevenson@gmail.com>
Closes #6784
This commit is contained in:
Scot W. Stevenson 2017-10-25 08:29:02 +02:00 committed by Tony Hutter
parent 53e5890cff
commit 5dc25de668

View File

@ -88,36 +88,38 @@ def div2():
sys.stdout.write("\n") sys.stdout.write("\n")
def fBytes(Bytes=0, Decimal=2): def fBytes(b=0):
kbytes = (2 ** 10) """Return human-readable representation of a byte value in
mbytes = (2 ** 20) powers of 2 (eg "KiB" for "kibibytes", etc) to two decimal
gbytes = (2 ** 30) points. Values smaller than one KiB are returned without
tbytes = (2 ** 40) decimal points.
pbytes = (2 ** 50) """
ebytes = (2 ** 60)
zbytes = (2 ** 70) prefixes = [
ybytes = (2 ** 80) [2**80, "YiB"], # yobibytes (yotta)
[2**70, "ZiB"], # zebibytes (zetta)
[2**60, "EiB"], # exbibytes (exa)
[2**50, "PiB"], # pebibytes (peta)
[2**40, "TiB"], # tebibytes (tera)
[2**30, "GiB"], # gibibytes (giga)
[2**20, "MiB"], # mebibytes (mega)
[2**10, "KiB"]] # kibibytes (kilo)
if b >= 2**10:
for limit, unit in prefixes:
if b >= limit:
value = b / limit
break
result = "%0.2f\t%s" % (value, unit)
if Bytes >= ybytes:
return str("%0." + str(Decimal) + "f") % (Bytes / ybytes) + "\tYiB"
elif Bytes >= zbytes:
return str("%0." + str(Decimal) + "f") % (Bytes / zbytes) + "\tZiB"
elif Bytes >= ebytes:
return str("%0." + str(Decimal) + "f") % (Bytes / ebytes) + "\tEiB"
elif Bytes >= pbytes:
return str("%0." + str(Decimal) + "f") % (Bytes / pbytes) + "\tPiB"
elif Bytes >= tbytes:
return str("%0." + str(Decimal) + "f") % (Bytes / tbytes) + "\tTiB"
elif Bytes >= gbytes:
return str("%0." + str(Decimal) + "f") % (Bytes / gbytes) + "\tGiB"
elif Bytes >= mbytes:
return str("%0." + str(Decimal) + "f") % (Bytes / mbytes) + "\tMiB"
elif Bytes >= kbytes:
return str("%0." + str(Decimal) + "f") % (Bytes / kbytes) + "\tKiB"
elif Bytes == 0:
return str("%d" % 0) + "\tBytes"
else: else:
return str("%d" % Bytes) + "\tBytes"
result = "%d\tBytes" % b
return result
def fHits(Hits=0, Decimal=2): def fHits(Hits=0, Decimal=2):