$e macro is now SMTP entry message (so that configuration version can

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

diff --git a/usr/src/usr.sbin/iostat/iostat.c b/usr/src/usr.sbin/iostat/iostat.c
index 5224f17..d27d539 100644 (file)
--- a/usr/src/usr.sbin/iostat/iostat.c
+++ b/usr/src/usr.sbin/iostat/iostat.c
@@ -1,8 +1,13 @@
-static char *sccsid = "@(#)iostat.c    4.1 (Berkeley) %G%";
+static char *sccsid = "@(#)iostat.c    4.6 (Berkeley) 81/04/21";

 /*
  * iostat
  */
 /*
  * iostat
  */

+#include <stdio.h>

 #include <nlist.h>
 #include <nlist.h>

+#include <sys/types.h>
+#include <sys/buf.h>
+#include <sys/ubavar.h>
+#include <sys/mbavar.h>

 #include <sys/dk.h>
 
 struct nlist nl[] = {
 #include <sys/dk.h>
 
 struct nlist nl[] = {


@@ -24,8 +29,15 @@ struct nlist nl[] = {
 #define        X_CP_TIME       7
        { "_dk_mspw" },
 #define        X_DK_MSPW       8
 #define        X_CP_TIME       7
        { "_dk_mspw" },
 #define        X_DK_MSPW       8

+       { "_mbdinit" },
+#define X_MBDINIT      9
+       { "_ubdinit" },
+#define X_UBDINIT      10

        { 0 },
 };
        { 0 },
 };

+
+char dr_name[DK_NDRIVE][10];
+

 struct
 {
        int     dk_busy;
 struct
 {
        int     dk_busy;


@@ -50,6 +62,7 @@ char *argv[];
        int iter;
        double f1, f2;
        long t;
        int iter;
        double f1, f2;
        long t;

+       int tohdr = 1;

 
        nlist("/vmunix", nl);
        if(nl[X_DK_BUSY].n_type == 0) {
 
        nlist("/vmunix", nl);
        if(nl[X_DK_BUSY].n_type == 0) {


@@ -68,20 +81,25 @@ char *argv[];
        }
        lseek(mf, (long)nl[X_DK_MSPW].n_value, 0);
        read(mf, s.dk_mspw, sizeof s.dk_mspw);
        }
        lseek(mf, (long)nl[X_DK_MSPW].n_value, 0);
        read(mf, s.dk_mspw, sizeof s.dk_mspw);

+       for (i = 0; i < DK_NDRIVE; i++)
+               sprintf(dr_name[i], "dk%d", i);
+       read_names();

        if(argc > 2)
                iter = atoi(argv[2]);
        if(argc > 2)
                iter = atoi(argv[2]);

-       printf("      TTY");
-       for (i = 0; i < DK_NDRIVE; i++)
-               if (s.dk_mspw[i] != 0.0)
-                       printf("           D%d ", i);
-       printf("         CPU\n");
-       printf(" tin tout");
-       for (i = 0; i < DK_NDRIVE; i++)
-               if (s.dk_mspw[i] != 0.0)
-                       printf(" sps tps msps ");
-       printf(" us ni sy id\n");
-

 loop:
 loop:

+       if (--tohdr == 0) {
+               printf("      tty");
+               for (i = 0; i < DK_NDRIVE; i++)
+                       if (s.dk_mspw[i] != 0.0)
+                               printf("          %3.3s ", dr_name[i]);
+               printf("         cpu\n");
+               printf(" tin tout");
+               for (i = 0; i < DK_NDRIVE; i++)
+                       if (s.dk_mspw[i] != 0.0)
+                               printf(" sps tps msps ");
+               printf(" us ni sy id\n");
+               tohdr = 19;
+       }

        lseek(mf, (long)nl[X_DK_BUSY].n_value, 0);
        read(mf, &s.dk_busy, sizeof s.dk_busy);
        lseek(mf, (long)nl[X_DK_TIME].n_value, 0);
        lseek(mf, (long)nl[X_DK_BUSY].n_value, 0);
        read(mf, &s.dk_busy, sizeof s.dk_busy);
        lseek(mf, (long)nl[X_DK_TIME].n_value, 0);


@@ -174,3 +192,51 @@ stat1(o)
                time = 1.0;
        printf("%3.0f", 100*s.cp_time[o]/time);
 }
                time = 1.0;
        printf("%3.0f", 100*s.cp_time[o]/time);
 }

+
+/*
+ * Read the drive names out of kmem.
+ * ARGH ARGH ARGH ARGH !!!!!!!!!!!!
+ */
+
+#define steal(where, var) lseek(mf, where, 0); read(mf, &var, sizeof var);
+read_names()
+{
+       struct mba_device mdev;
+       register struct mba_device *mp;
+       struct mba_driver mdrv;
+       short two_char;
+       char *cp = (char *) &two_char;
+       struct uba_device udev, *up;
+       struct uba_driver udrv;
+
+       mp = (struct mba_device *) nl[X_MBDINIT].n_value;
+       up = (struct uba_device *) nl[X_UBDINIT].n_value;
+       if (up == 0)
+       {
+               fprintf(stderr, "iostat: Disk init info not in namelist\n");
+               exit(1);
+       }
+       if (mp)
+       while(1)
+       {
+               steal(mp++, mdev);
+               if (mdev.mi_driver == 0)
+                       break;
+               if (mdev.mi_dk < 0 || mdev.mi_alive == 0)
+                       continue;
+               steal(mdev.mi_driver, mdrv);
+               steal(mdrv.md_dname, two_char);
+               sprintf(dr_name[mdev.mi_dk], "%c%c%d", cp[0], cp[1], mdev.mi_unit);
+       }
+       while(1)
+       {
+               steal(up++, udev);
+               if (udev.ui_driver == 0)
+                       break;
+               if (udev.ui_dk < 0 || udev.ui_alive == 0)
+                       continue;
+               steal(udev.ui_driver, udrv);
+               steal(udrv.ud_dname, two_char);
+               sprintf(dr_name[udev.ui_dk], "%c%c%d", cp[0], cp[1], udev.ui_unit);
+       }
+}