src/usr.bin/systat/vmstat.c - diff

Return to vmstat.c CVS log

Up to [local] / src / usr.bin / systat

Diff for /src/usr.bin/systat/vmstat.c between version 1.67 and 1.68

version 1.67, 2008/12/07 02:56:06

version 1.68, 2009/03/30 05:35:22

Line 89

static void dinfo(int, int);

static void getinfo(struct Info *);

void putint(int, int, int, int);

void putintmk(int, int, int, int);

void putuint64(u_int64_t, int, int, int);

void putfloat(double, int, int, int, int, int);

int ucount(void);

Line 288

Line 289

mvprintw(DISKROW, DISKCOL, "Disks");

mvprintw(DISKROW + 1, DISKCOL, "seeks");

mvprintw(DISKROW + 2, DISKCOL, "xfers");

mvprintw(DISKROW + 3, DISKCOL, "Kbyte");

mvprintw(DISKROW + 3, DISKCOL, "speed");

mvprintw(DISKROW + 4, DISKCOL, " sec");

for (i = 0, j = 0; i < cur.dk_ndrive && j < DRIVESPACE; i++)

if (cur.dk_select[i] && (j + strlen(dr_name[i])) < DRIVESPACE) {

Line 525

Line 526

}

void

putintmk(int n, int l, int c, int w)

{

char b[128];

move(l, c);

if (n == 0) {

while (w-- > 0)

addch(' ');

return;

}

if (n > 1024 * 1024)

snprintf(b, sizeof b, "%*dG", w - 1, n / 1024 / 1024);

else if (n > 1024)

snprintf(b, sizeof b, "%*dM", w - 1, n / 1024);

else

snprintf(b, sizeof b, "%*dK", w - 1, n);

if (strlen(b) > w) {

while (w-- > 0)

addch('*');

return;

}

addstr(b);

}

void

putuint64(u_int64_t n, int l, int c, int w)

{

char b[128];

Line 648

Line 674

putint((int)((float)cur.dk_seek[dn]/etime+0.5), DISKROW + 1, c, 5);

putint((int)((float)(cur.dk_rxfer[dn] + cur.dk_wxfer[dn])/etime+0.5),

DISKROW + 2, c, 5);

putint((int)(words/etime + 0.5), DISKROW + 3, c, 5);

putintmk((int)(words/etime + 0.5), DISKROW + 3, c, 5);

putfloat(atime/etime, DISKROW + 4, c, 5, 1, 1);

}