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

Return to iostat.c CVS log

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

Diff for /src/usr.bin/systat/iostat.c between version 1.25 and 1.26

version 1.25, 2006/06/27 10:28:25

version 1.26, 2006/06/29 21:17:27

Line 55

static void numlabels(void);

#define ATIME(x,y) ( \

#define ATIME(x,y) ((double)x[y].tv_sec + \

(double)x[y].tv_sec + \

((double)x[y].tv_usec / (double)1000000))

((double)x[y].tv_usec / (double)1000000) \

)

#define NFMT "%-8.8s %12.0f %14.0f %10.0f %10.0f %10.1f"

#define SFMT "%6s %14s %14s %10s %10s %10s"

#define NFMT "%-8.8s %14.0f %14.0f %10.0f %10.0f %10.1f"

#define SFMT "%-8.8s %14s %14s %10s %10s %10s"

WINDOW *

openiostat(void)

{

Line 97

Line 96

void

labeliostat(void)

{

mvwprintw(wnd, 1, 0, SFMT, "Device", "rbytes", "wbytes", "rtps",

mvwprintw(wnd, 1, 0, SFMT, "Device", "rKBytes", "wKBytes", "rtps",

"wtps", "msec");

}

Line 146

Line 145

for (dn = 0; dn < cur.dk_ndrive; dn++) {

rsum += cur.dk_rbytes[dn] / etime;

wsum += cur.dk_wbytes[dn] /etime;

wsum += cur.dk_wbytes[dn] / etime;

rtsum += cur.dk_rxfer[dn] / etime;

wtsum += cur.dk_wxfer[dn] / etime;

mssum += ATIME(cur.dk_time, dn) / etime;

mvwprintw(wnd, row++, 0, NFMT,

cur.dk_name[dn],

cur.dk_rbytes[dn] / etime,

cur.dk_rbytes[dn] / 1024.0 / etime,

cur.dk_wbytes[dn] / etime,

cur.dk_wbytes[dn] / 1024.0 / etime,

cur.dk_rxfer[dn] / etime,

cur.dk_wxfer[dn] / etime,

ATIME(cur.dk_time, dn) / etime);

}

mvwprintw(wnd, row++, 0, NFMT,

"Totals", rsum, wsum, rtsum, wtsum, mssum);

"Totals", rsum / 1024.0, wsum / 1024.0, rtsum, wtsum, mssum);

}

int