Bell 32V development

[unix-history] / usr / src / cmd / iostat.c

diff --git a/usr/src/cmd/iostat.c b/usr/src/cmd/iostat.c
index 8e03f88..0eb92a3 100644 (file)
--- a/usr/src/cmd/iostat.c
+++ b/usr/src/cmd/iostat.c
@@ -11,6 +11,11 @@ struct
        unsigned        value;
 } nl[] = {
        "_dk_busy", 0, 0,
        unsigned        value;
 } nl[] = {
        "_dk_busy", 0, 0,

+       "_dk_time", 0, 0,
+       "_dk_numb", 0, 0,
+       "_dk_wds", 0, 0,
+       "_tk_nin", 0, 0,
+       "_tk_nout", 0, 0,

        "_io_info", 0, 0,
        "\0\0\0\0\0\0\0\0", 0, 0
 };
        "_io_info", 0, 0,
        "\0\0\0\0\0\0\0\0", 0, 0
 };


@@ -87,7 +92,17 @@ char *argv[];
 
 loop:
        lseek(mf, (long)nl[0].value, 0);
 
 loop:
        lseek(mf, (long)nl[0].value, 0);

-       read(mf, (char *)&s, sizeof s);
+       read(mf, &s.busy, sizeof s.busy);
+       lseek(mf, (long)nl[1].value, 0);
+       read(mf, s.etime, sizeof s.etime);
+       lseek(mf, (long)nl[2].value, 0);
+       read(mf, s.numb, sizeof s.numb);
+       lseek(mf, (long)nl[3].value, 0);
+       read(mf, s.wds, sizeof s.wds);
+       lseek(mf, (long)nl[4].value, 0);
+       read(mf, &s.tin, sizeof s.tin);
+       lseek(mf, (long)nl[5].value, 0);
+       read(mf, &s.tout, sizeof s.tout);

        for(i=0; i<40; i++) {
                t = s.etime[i];
                s.etime[i] -= s1.etime[i];
        for(i=0; i<40; i++) {
                t = s.etime[i];
                s.etime[i] -= s1.etime[i];


@@ -166,7 +181,7 @@ stats(dn)
        }
        f3 = s.wds[dn];
        f3 = f3*32.;
        }
        f3 = s.wds[dn];
        f3 = f3*32.;

-       f4 = xf[dn];
+       f4 = xf[2];             /* so far, only RP06's */

        f4 = f4*1.0e-6;
        f5 = f1 - f4*f3;
        f6 = f1 - f5;
        f4 = f4*1.0e-6;
        f5 = f1 - f4*f3;
        f6 = f1 - f5;


@@ -255,7 +270,7 @@ biostats()
 {
 register i;
 
 {
 register i;
 

-       lseek(mf,(long)nl[1].value, 0);
+       lseek(mf,(long)nl[6].value, 0);

        read(mf, (char *)&io_info, sizeof(io_info));
        printf("%D\t%D\t%D\t%D\n",
         io_info.nread-io_delta.nread, io_info.nreada-io_delta.nreada,
        read(mf, (char *)&io_info, sizeof(io_info));
        printf("%D\t%D\t%D\t%D\n",
         io_info.nread-io_delta.nread, io_info.nreada-io_delta.nreada,