d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add the Tera scale factor, which is an easy job now.

Browse Source 
More scale factors would overflow the command line where
the help for "scale" were shown.
This commit is contained in:
Yaroslav Tykhiy 2006-11-27 16:33:44 +00:00
parent a6fac34b43
commit dfaa9125d8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=164675
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.bin/systat/convtbl.c
View File

@ -41,6 +41,7 @@
#define KILO (1024LL)
#define MEGA (KILO * 1024)
#define GIGA (MEGA * 1024)
#define TERA (GIGA * 1024)
struct convtbl {
uintmax_t mul;
@ -55,11 +56,13 @@ static struct convtbl convtbl[] = {
[SC_KILOBYTE] = { BYTE, KILO, "KB", "kbyte" },
[SC_MEGABYTE] = { BYTE, MEGA, "MB", "mbyte" },
[SC_GIGABYTE] = { BYTE, GIGA, "GB", "gbyte" },
[SC_TERABYTE] = { BYTE, TERA, "TB", "tbyte" },
[SC_BIT] = { BIT, BITS, "b", "bit" },
[SC_KILOBIT] = { BIT, KILO, "Kb", "kbit" },
[SC_MEGABIT] = { BIT, MEGA, "Mb", "mbit" },
[SC_GIGABIT] = { BIT, GIGA, "Gb", "gbit" },
[SC_TERABIT] = { BIT, TERA, "Tb", "tbit" },
[SC_AUTO] = { 0, 0, "", "auto" }
};
@ -82,7 +85,7 @@ get_tbl_ptr(const uintmax_t size, const int scale)
* index as the array index into the conversion table.
*/
for (tmp = size, idx = SC_KILOBYTE;
tmp >= MEGA && idx < SC_GIGABYTE;
tmp >= MEGA && idx < SC_BIT - 1;
tmp >>= 10, idx++);
return (&convtbl[idx]);

5
usr.bin/systat/convtbl.h
View File

@ -34,15 +34,20 @@
#include <sys/types.h>
#include <stdint.h>
/*
* Keep the order in the enum.
*/
enum scale {
SC_BYTE,
SC_KILOBYTE,
SC_MEGABYTE,
SC_GIGABYTE,
SC_TERABYTE,
SC_BIT,
SC_KILOBIT,
SC_MEGABIT,
SC_GIGABIT,
SC_TERABIT,
SC_AUTO /* KEEP THIS LAST */
};