vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-29 15:39:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Stantardizes data rates to the SI

Browse source 
https://en.wikipedia.org/wiki/Data_rate_units
This commit is contained in:
Simone Mainardi 2017-04-05 15:59:15 +02:00
parent a1e873a985
commit 6060e561db
2 changed files with 24 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

24
scripts/lua/modules/lua_utils.lua
View file

@ -536,13 +536,13 @@ function bytesToSize(bytes)
if((bytes >= 0) and (bytes < kilobyte)) then
return round(bytes, precision) .. " B";
elseif((bytes >= kilobyte) and (bytes < megabyte)) then
return round(bytes / kilobyte, precision) .. ' KB';
return round(bytes / kilobyte, precision) .. ' KiB';
elseif((bytes >= megabyte) and (bytes < gigabyte)) then
return round(bytes / megabyte, precision) .. ' MB';
return round(bytes / megabyte, precision) .. ' MiB';
elseif((bytes >= gigabyte) and (bytes < terabyte)) then
return round(bytes / gigabyte, precision) .. ' GB';
return round(bytes / gigabyte, precision) .. ' GiB';
elseif(bytes >= terabyte) then
return round(bytes / terabyte, precision) .. ' TB';
return round(bytes / terabyte, precision) .. ' TiB';
else
return round(bytes, precision) .. ' B';
end
@ -559,15 +559,15 @@ function bitsToSizeMultiplier(bits, multiplier)
terabit = gigabit * multiplier;
if((bits >= kilobit) and (bits < megabit)) then
return round(bits / kilobit, precision) .. ' Kbit';
return round(bits / kilobit, precision) .. ' kbit/s';
elseif((bits >= megabit) and (bits < gigabit)) then
return round(bits / megabit, precision) .. ' Mbit';
return round(bits / megabit, precision) .. ' Mbit/s';
elseif((bits >= gigabit) and (bits < terabit)) then
return round(bits / gigabit, precision) .. ' Gbit';
return round(bits / gigabit, precision) .. ' Gbit/s';
elseif(bits >= terabit) then
return round(bits / terabit, precision) .. ' Tbit';
return round(bits / terabit, precision) .. ' Tbit/s';
else
return round(bits, precision) .. ' bps';
return round(bits, precision) .. ' bit/s';
end
end
@ -2688,9 +2688,9 @@ FMT_TO_DATA_RATES_KBPS = {
FMT_TO_DATA_BYTES = {
["b"] = {label="B", value=1},
["k"] = {label="KB", value=1024},
["m"] = {label="MB", value=1024*1024},
["g"] = {label="GB", value=1024*1024*1024},
["k"] = {label="KiB", value=1024},
["m"] = {label="MiB", value=1024*1024},
["g"] = {label="GiB", value=1024*1024*1024},
}
FMT_TO_DATA_TIME = {