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

Dynamically resize the Disk column. It was too narrow for modern

Browse Source 
disk device names such as da0s1b.  So we also get rid of the nasty
constant 5 scattered over the code.

Implementing this change is a good chance to improve other bits
around it: init saved lengths early, always check return value from
kvm_getswapinfo().
This commit is contained in:
Yaroslav Tykhiy 2006-12-23 18:54:49 +00:00
parent 35e0662415
commit c19a20a7d1
1 changed files with 46 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
usr.bin/systat/swap.c
View File

@ -62,6 +62,7 @@ kvm_t *kd;
static char *header; static char *header;
static long blocksize; static long blocksize;
static int dlen, odlen;
static int hlen; static int hlen;
static int ulen, oulen; static int ulen, oulen;
static int pagesize; static int pagesize;
@ -89,12 +90,36 @@ closeswap(w)
* Kevin Lahey <kml@rokkaku.atl.ga.us>. * Kevin Lahey <kml@rokkaku.atl.ga.us>.
*/ */
#define NSWAP 16
static struct kvm_swap kvmsw[NSWAP];
static int kvnsw, okvnsw;
#define CONVERT(v) ((int)((int64_t)(v) * pagesize / blocksize))
static void
calclens()
{
int i, n;
int len;
dlen = sizeof("Disk");
for (i = 0; i < kvnsw; ++i) {
len = strlen(kvmsw[i].ksw_devname);
if (dlen < len)
dlen = len;
}
ulen = sizeof("Used");
for (n = CONVERT(kvmsw[kvnsw].ksw_used), len = 2; n /= 10; ++len);
if (ulen < len)
ulen = len;
}
int int
initswap() initswap()
{ {
char msgbuf[BUFSIZ];
static int once = 0; static int once = 0;
struct kvm_swap dummy;
if (once) if (once)
return (1); return (1);
@ -102,33 +127,33 @@ initswap()
header = getbsize(&hlen, &blocksize); header = getbsize(&hlen, &blocksize);
pagesize = getpagesize(); pagesize = getpagesize();
if (kvm_getswapinfo(kd, &dummy, 1, 0) < 0) { if ((kvnsw = kvm_getswapinfo(kd, kvmsw, NSWAP, 0)) < 0) {
snprintf(msgbuf, sizeof(msgbuf), "systat: kvm_getswapinfo failed"); error("systat: kvm_getswapinfo failed");
error("%s", msgbuf);
return (0); return (0);
} }
okvnsw = kvnsw;
calclens();
odlen = dlen;
oulen = ulen;
once = 1; once = 1;
return (1); return (1);
} }
static struct kvm_swap kvmsw[16];
static int kvnsw, okvnsw;
#define CONVERT(v) ((int)((int64_t)(v) * pagesize / blocksize))
void void
fetchswap() fetchswap()
{ {
int n;
okvnsw = kvnsw; okvnsw = kvnsw;
kvnsw = kvm_getswapinfo(kd, kvmsw, 16, 0); if ((kvnsw = kvm_getswapinfo(kd, kvmsw, NSWAP, 0)) < 0) {
error("systat: kvm_getswapinfo failed");
return;
}
odlen = dlen;
oulen = ulen; oulen = ulen;
for (n = CONVERT(kvmsw[kvnsw].ksw_used), ulen = 2; n /= 10; ++ulen); calclens();
if (ulen < sizeof("Used"))
ulen = sizeof("Used");
} }
void void
@ -141,8 +166,8 @@ labelswap()
werase(wnd); werase(wnd);
mvwprintw(wnd, 0, 0, "%-5s%*s%*s %s", mvwprintw(wnd, 0, 0, "%*s%*s%*s %s",
"Disk", hlen, header, ulen, "Used", -dlen, "Disk", hlen, header, ulen, "Used",
"/0% /10 /20 /30 /40 /50 /60 /70 /80 /90 /100"); "/0% /10 /20 /30 /40 /50 /60 /70 /80 /90 /100");
for (i = 0; i <= kvnsw; ++i) { for (i = 0; i <= kvnsw; ++i) {
@ -152,7 +177,7 @@ labelswap()
name = "Total"; name = "Total";
} else } else
name = kvmsw[i].ksw_devname; name = kvmsw[i].ksw_devname;
mvwprintw(wnd, i + 1, 0, "%-5s", name); mvwprintw(wnd, i + 1, 0, "%*s", -dlen, name);
} }
} }
@ -162,7 +187,7 @@ showswap()
int count; int count;
int i; int i;
if (kvnsw != okvnsw || ulen != oulen) if (kvnsw != okvnsw || dlen != odlen || ulen != oulen)
labelswap(); labelswap();
for (i = 0; i <= kvnsw; ++i) { for (i = 0; i <= kvnsw; ++i) {
@ -175,13 +200,13 @@ showswap()
mvwprintw( mvwprintw(
wnd, wnd,
i + 1, i + 1,
5 + hlen + ulen + 1, dlen + hlen + ulen + 1,
"(swap not configured)" "(swap not configured)"
); );
continue; continue;
} }
wmove(wnd, i + 1, 5); wmove(wnd, i + 1, dlen);
wprintw(wnd, "%*d", hlen, CONVERT(kvmsw[i].ksw_total)); wprintw(wnd, "%*d", hlen, CONVERT(kvmsw[i].ksw_total));
wprintw(wnd, "%*d", ulen, CONVERT(kvmsw[i].ksw_used)); wprintw(wnd, "%*d", ulen, CONVERT(kvmsw[i].ksw_used));