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.31 and 1.32

version 1.31, 2001/12/07 09:18:08

version 1.32, 2002/02/16 00:18:09

Line 182

#define DISKROW 18 /* uses 5 rows and 50 cols (for 9 drives) */

#define DISKCOL 0

#define DRIVESPACE 9 /* max # for space */

#define DRIVESPACE 45 /* max space for drives */

#if DK_NDRIVE > DRIVESPACE

#define MAXDRIVES DRIVESPACE /* max # to display */

#else

#define MAXDRIVES DK_NDRIVE /* max # to display */

#endif

int

initkre()

{

Line 289

Line 283

void

labelkre()

{

int i, j;

int i, j, l;

clear();

mvprintw(STATROW, STATCOL + 4, "users Load");

Line 342

Line 336

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

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

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

j = 0;

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

for (i = 0; i < dk_ndrive && j < MAXDRIVES; i++)

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

if (dk_select[i]) {

l = MAX(4, strlen(dr_name[i]));

mvprintw(DISKROW, DISKCOL + 5 + 5 * j,

mvprintw(DISKROW, DISKCOL + 5 + j,

" %4.4s", dr_name[j]);

" %*s", l, dr_name[i]);

j++;

j += 1 + l;

}

for (i = 0; i < nintr; i++) {

if (intrloc[i] == 0)

Line 508

Line 502

PUTRATE(uvmexp.softs, GENSTATROW + 1, GENSTATCOL + 24, 6);

PUTRATE(uvmexp.faults, GENSTATROW + 1, GENSTATCOL + 30, 5);

mvprintw(DISKROW, DISKCOL + 5, " ");

for (i = 0, c = 0; i < dk_ndrive && c < MAXDRIVES; i++)

for (i = 0, c = 0; i < dk_ndrive && c < DRIVESPACE; i++)

if (dk_select[i]) {

if (dk_select[i] && (c + strlen(dr_name[i])) < DRIVESPACE) {

mvprintw(DISKROW, DISKCOL + 5 + 5 * c,

l = MAX(4, strlen(dr_name[i]));

" %4.4s", dr_name[i]);

mvprintw(DISKROW, DISKCOL + 5 + c,

dinfo(i, ++c);

" %*s", l, dr_name[i]);

c += 1 + l;

dinfo(i, c);

}

/* and pad the DRIVESPACE */

l = DRIVESPACE - c;

for (i = 0; i < 5; i++)

mvprintw(DISKROW + i, DISKCOL + 5 + c, "%*s", l, "");

putint(s.nchcount, NAMEIROW + 2, NAMEICOL, 9);

putint(nchtotal.ncs_goodhits, NAMEIROW + 2, NAMEICOL + 10, 8);

#define nz(x) ((x) ? (x) : 1)

Line 711

Line 712

{

double words, atime;

c = DISKCOL + c * 5;

c += DISKCOL;

/* time busy in disk activity */

atime = (double)cur.dk_time[dn].tv_sec +