projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added depend label
[unix-history] / usr / src / usr.bin / systat / iostat.c
diff --git a/usr/src/usr.bin/systat/iostat.c b/usr/src/usr.bin/systat/iostat.c
index 3043514..f9b8c9b 100644 (file)
--- a/usr/src/usr.bin/systat/iostat.c
+++ b/usr/src/usr.bin/systat/iostat.c
@@ -1,27 +1,24 @@
+/*
+ * Copyright (c) 1980 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ */
+
 #ifndef lint
 #ifndef lint
-static char sccsid[] = "@(#)iostat.c   1.4 (Lucasfilm) %G%";
-#endif
+static char sccsid[] = "@(#)iostat.c   5.3 (Berkeley) %G%";
+#endif not lint
 
 /*
  * iostat
  */
 #include "systat.h"
 
 /*
  * iostat
  */
 #include "systat.h"
-#include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/buf.h>
-#include <sys/file.h>
-#include <nlist.h>
-
-#define WBASEROW        4
-#define WBASECOL        5
 
 WINDOW *
 openiostat()
 {
 
 WINDOW *
 openiostat()
 {
-        static WINDOW *w = NULL;
 
 
-        if (w == NULL)
-                w = newwin(LINES - 1 - WBASEROW, 0, WBASEROW, WBASECOL);
-        return (w);
+       return (subwin(stdscr, LINES-1-5, 0, 5, 0));
 }
 
 closeiostat(w)
 }
 
 closeiostat(w)
@@ -30,10 +27,9 @@ closeiostat(w)
 
         if (w == NULL)
                 return;
 
         if (w == NULL)
                 return;
-        move(WBASEROW, 0);
-        clrtobot();
         wclear(w);
         wrefresh(w);
         wclear(w);
         wrefresh(w);
+       delwin(w);
 }
 
 static struct nlist nlst[] = {
 }
 
 static struct nlist nlst[] = {
@@ -49,15 +45,15 @@ static struct nlist nlst[] = {
         { "_dk_seek" },
 #define X_CP_TIME       5
         { "_cp_time" },
         { "_dk_seek" },
 #define X_CP_TIME       5
         { "_cp_time" },
-#define X_DK_MSPW       6
-        { "_dk_mspw" },
-#define X_HZ            7
-        { "_hz" },
 #ifdef vax
 #ifdef vax
-#define X_MBDINIT       8
+#define X_MBDINIT       (X_CP_TIME+1)
         { "_mbdinit" },
         { "_mbdinit" },
-#define X_UBDINIT       9
+#define X_UBDINIT       (X_CP_TIME+2)
         { "_ubdinit" },
         { "_ubdinit" },
+#endif
+#ifdef tahoe
+#define        X_VBDINIT       (X_CP_TIME+1)
+       { "_vbdinit" },
 #endif
         { "" },
 };
 #endif
         { "" },
 };
@@ -65,45 +61,40 @@ static struct nlist nlst[] = {
 static struct {
         int     dk_busy;
         long    cp_time[CPUSTATES];
 static struct {
         int     dk_busy;
         long    cp_time[CPUSTATES];
-        long    dk_time[DK_NDRIVE];
-        long    dk_wds[DK_NDRIVE];
-        long    dk_seek[DK_NDRIVE];
-        long    dk_xfer[DK_NDRIVE];
+        long    *dk_time;
+        long    *dk_wds;
+        long    *dk_seek;
+        long    *dk_xfer;
 } s, s1;
 
 static  int linesperregion;
 static  double etime;
 static  int numbers = 0;                /* default display bar graphs */
 } s, s1;
 
 static  int linesperregion;
 static  double etime;
 static  int numbers = 0;                /* default display bar graphs */
-static  int msps = 1;                   /* default ms/seek shown */
-static  int dk_select[DK_NDRIVE];
+static  int msps = 0;                   /* default ms/seek shown */
 
 initiostat()
 {
 
 initiostat()
 {
-        register  i;
 
         if (nlst[X_DK_BUSY].n_type == 0) {
                 nlist("/vmunix", nlst);
                 if (nlst[X_DK_BUSY].n_type == 0) {
                         error("Disk init information isn't in namelist");
 
         if (nlst[X_DK_BUSY].n_type == 0) {
                 nlist("/vmunix", nlst);
                 if (nlst[X_DK_BUSY].n_type == 0) {
                         error("Disk init information isn't in namelist");
-                        return;
+                        return(0);
                 }
         }
                 }
         }
-        if (ndrives == 0) {
-                lseek(kmem, (long)nlst[X_DK_MSPW].n_value, L_SET);
-                read(kmem, dk_mspw, sizeof (dk_mspw));
-                for (i = 0; i < DK_NDRIVE; i++)
-                        if (dk_mspw[i] != 0.0)
-                                sprintf(dr_name[i], "dk%d", i), ndrives++;
-#ifdef vax
-                read_names(nlst[X_MBDINIT].n_value, nlst[X_UBDINIT].n_value);
-#endif
-        }
-        if (hz == 0) {
-                lseek(kmem, (long)nlst[X_HZ].n_value, L_SET);
-                read(kmem, &hz, sizeof hz);
-        }
-        for (i = 0; i < DK_NDRIVE; i++)
-                dk_select[i] = 1;
+       if (! dkinit())
+               return(0);
+       if (dk_ndrive) {
+#define        allocate(e, t) \
+    s./**/e = (t *)calloc(dk_ndrive, sizeof (t)); \
+    s1./**/e = (t *)calloc(dk_ndrive, sizeof (t));
+               allocate(dk_time, long);
+               allocate(dk_wds, long);
+               allocate(dk_seek, long);
+               allocate(dk_xfer, long);
+#undef allocate
+       }
+       return(1);
 }
 
 fetchiostat()
 }
 
 fetchiostat()
@@ -111,20 +102,21 @@ fetchiostat()
 
         if (nlst[X_DK_BUSY].n_type == 0)
                 return;
 
         if (nlst[X_DK_BUSY].n_type == 0)
                 return;
-        lseek(kmem, (long)nlst[X_DK_BUSY].n_value, L_SET);
-        read(kmem, &s.dk_busy, sizeof s.dk_busy);
+       s.dk_busy = getw(nlst[X_DK_BUSY].n_value);
         lseek(kmem, (long)nlst[X_DK_TIME].n_value, L_SET);
         lseek(kmem, (long)nlst[X_DK_TIME].n_value, L_SET);
-        read(kmem, s.dk_time, sizeof s.dk_time);
+        read(kmem, s.dk_time, dk_ndrive * sizeof (long));
         lseek(kmem, (long)nlst[X_DK_XFER].n_value, L_SET);
         lseek(kmem, (long)nlst[X_DK_XFER].n_value, L_SET);
-        read(kmem, s.dk_xfer, sizeof s.dk_xfer);
+        read(kmem, s.dk_xfer, dk_ndrive * sizeof (long));
         lseek(kmem, (long)nlst[X_DK_WDS].n_value, L_SET);
         lseek(kmem, (long)nlst[X_DK_WDS].n_value, L_SET);
-        read(kmem, s.dk_wds, sizeof s.dk_wds);
+        read(kmem, s.dk_wds, dk_ndrive * sizeof (long));
         lseek(kmem, (long)nlst[X_DK_SEEK].n_value, L_SET);
         lseek(kmem, (long)nlst[X_DK_SEEK].n_value, L_SET);
-        read(kmem, s.dk_seek, sizeof s.dk_seek);
+        read(kmem, s.dk_seek, dk_ndrive * sizeof (long));
         lseek(kmem, (long)nlst[X_CP_TIME].n_value, L_SET);
         read(kmem, s.cp_time, sizeof s.cp_time);
 }
 
         lseek(kmem, (long)nlst[X_CP_TIME].n_value, L_SET);
         read(kmem, s.cp_time, sizeof s.cp_time);
 }
 
+#define        INSET   10
+
 labeliostat()
 {
         int row;
 labeliostat()
 {
         int row;
@@ -133,14 +125,14 @@ labeliostat()
                 error("No dk_busy defined.");
                 return;
         }
                 error("No dk_busy defined.");
                 return;
         }
-        row = WBASEROW + 1;
-        move(row, 0); clrtobot();
-        mvaddstr(row++, WBASECOL + 5, 
+        row = 0;
+        wmove(wnd, row, 0); wclrtobot(wnd);
+        mvwaddstr(wnd, row++, INSET, 
             "/0   /10  /20  /30  /40  /50  /60  /70  /80  /90  /100");
             "/0   /10  /20  /30  /40  /50  /60  /70  /80  /90  /100");
-        mvaddstr(row++, 0, "cpu  user|");
-        mvaddstr(row++, 0, "     nice|");
-        mvaddstr(row++, 0, "   system|");
-        mvaddstr(row++, 0, "     idle|");
+        mvwaddstr(wnd, row++, 0, "cpu  user|");
+        mvwaddstr(wnd, row++, 0, "     nice|");
+        mvwaddstr(wnd, row++, 0, "   system|");
+        mvwaddstr(wnd, row++, 0, "     idle|");
         if (numbers)
                 row = numlabels(row + 1);
         else
         if (numbers)
                 row = numlabels(row + 1);
         else
@@ -150,15 +142,18 @@ labeliostat()
 static
 numlabels(row)
 {
 static
 numlabels(row)
 {
-        int i, col, regions;
+        int i, col, regions, ndrives;
 
 #define COLWIDTH        14
 
 #define COLWIDTH        14
-#define DRIVESPERLINE   ((COLS - WBASECOL) / COLWIDTH)
+#define DRIVESPERLINE   ((wnd->_maxx - INSET) / COLWIDTH)
+       for (ndrives = 0, i = 0; i < dk_ndrive; i++)
+               if (dk_select[i])
+                       ndrives++;
         regions = howmany(ndrives, DRIVESPERLINE);
         /*
          * Deduct -regions for blank line after each scrolling region.
          */
         regions = howmany(ndrives, DRIVESPERLINE);
         /*
          * Deduct -regions for blank line after each scrolling region.
          */
-        linesperregion = (CMDLINE - row - regions) / regions;
+        linesperregion = (wnd->_maxy - row - regions) / regions;
         /*
          * Minimum region contains space for two
          * label lines and one line of statistics.
         /*
          * Minimum region contains space for two
          * label lines and one line of statistics.
@@ -166,15 +161,15 @@ numlabels(row)
         if (linesperregion < 3)
                 linesperregion = 3;
         col = 0;
         if (linesperregion < 3)
                 linesperregion = 3;
         col = 0;
-        for (i = 0; i < DK_NDRIVE; i++)
+        for (i = 0; i < dk_ndrive; i++)
                 if (dk_select[i] && dk_mspw[i] != 0.0) {
                 if (dk_select[i] && dk_mspw[i] != 0.0) {
-                        if (col + COLWIDTH >= COLS - WBASECOL) {
+                        if (col + COLWIDTH >= wnd->_maxx - INSET) {
                                 col = 0, row += linesperregion + 1;
                                 col = 0, row += linesperregion + 1;
-                                if (row > CMDLINE - (linesperregion + 1))
+                                if (row > wnd->_maxy - (linesperregion + 1))
                                         break;
                         }
                                         break;
                         }
-                        mvwaddstr(wnd, row - WBASEROW, col + 4, dr_name[i]);
-                        mvwaddstr(wnd, row + 1 - WBASEROW, col, "bps tps msps");
+                        mvwaddstr(wnd, row, col + 4, dr_name[i]);
+                        mvwaddstr(wnd, row + 1, col, "bps tps msps");
                         col += COLWIDTH;
                 }
         if (col)
                         col += COLWIDTH;
                 }
         if (col)
@@ -188,17 +183,17 @@ barlabels(row)
 {
         int i;
 
 {
         int i;
 
-        mvaddstr(row++, 10,
+        mvwaddstr(wnd, row++, INSET,
             "/0   /5   /10  /15  /20  /25  /30  /35  /40  /45  /50");
         linesperregion = 2 + msps;
             "/0   /5   /10  /15  /20  /25  /30  /35  /40  /45  /50");
         linesperregion = 2 + msps;
-        for (i = 0; i < DK_NDRIVE; i++)
+        for (i = 0; i < dk_ndrive; i++)
                 if (dk_select[i] && dk_mspw[i] != 0.0) {
                 if (dk_select[i] && dk_mspw[i] != 0.0) {
-                        if (row > CMDLINE - linesperregion)
+                        if (row > wnd->_maxy - linesperregion)
                                 break;
                                 break;
-                        mvprintw(row++, 0, "%3.3s   bps|", dr_name[i]);
-                        mvaddstr(row++, 0, "      tps|");
+                        mvwprintw(wnd, row++, 0, "%3.3s   bps|", dr_name[i]);
+                        mvwaddstr(wnd, row++, 0, "      tps|");
                         if (msps)
                         if (msps)
-                                mvaddstr(row++, 0, "     msps|");
+                                mvwaddstr(wnd, row++, 0, "     msps|");
                 }
         return (row);
 }
                 }
         return (row);
 }
@@ -210,7 +205,7 @@ showiostat()
 
         if (nlst[X_DK_BUSY].n_type == 0)
                 return;
 
         if (nlst[X_DK_BUSY].n_type == 0)
                 return;
-        for (i = 0; i < DK_NDRIVE; i++) {
+        for (i = 0; i < dk_ndrive; i++) {
 #define X(fld)  t = s.fld[i]; s.fld[i] -= s1.fld[i]; s1.fld[i] = t
                 X(dk_xfer); X(dk_seek); X(dk_wds); X(dk_time);
         }
 #define X(fld)  t = s.fld[i]; s.fld[i] -= s1.fld[i]; s1.fld[i] = t
                 X(dk_xfer); X(dk_seek); X(dk_wds); X(dk_time);
         }
@@ -222,16 +217,16 @@ showiostat()
         if (etime == 0.0)
                 etime = 1.0;
         etime /= (float) hz;
         if (etime == 0.0)
                 etime = 1.0;
         etime /= (float) hz;
-        row = 2;
+        row = 1;
         for (i = 0; i < CPUSTATES; i++)
                 stat1(row++, i);
         if (!numbers) {
                 row += 2;
         for (i = 0; i < CPUSTATES; i++)
                 stat1(row++, i);
         if (!numbers) {
                 row += 2;
-                for (i = 0; i < DK_NDRIVE; i++)
+                for (i = 0; i < dk_ndrive; i++)
                         if (dk_select[i] && dk_mspw[i] != 0.0) {
                         if (dk_select[i] && dk_mspw[i] != 0.0) {
-                                if (row > CMDLINE - linesperregion - WBASEROW)
+                                if (row > wnd->_maxy - linesperregion)
                                         break;
                                         break;
-                                row = stats(row, 10 - WBASECOL, i);
+                                row = stats(row, INSET, i);
                         }
                 return;
         }
                         }
                 return;
         }
@@ -240,12 +235,11 @@ showiostat()
         wdeleteln(wnd);
         wmove(wnd, row + 3, 0);
         winsertln(wnd);
         wdeleteln(wnd);
         wmove(wnd, row + 3, 0);
         winsertln(wnd);
-        for (i = 0; i < DK_NDRIVE; i++)
+        for (i = 0; i < dk_ndrive; i++)
                 if (dk_select[i] && dk_mspw[i] != 0.0) {
                 if (dk_select[i] && dk_mspw[i] != 0.0) {
-                        if (col + COLWIDTH >= COLS - WBASECOL) {
+                        if (col + COLWIDTH >= wnd->_maxx) {
                                 col = 0, row += linesperregion + 1;
                                 col = 0, row += linesperregion + 1;
-                                if (row + WBASEROW >
-                                    CMDLINE - (linesperregion + 1))
+                                if (row > wnd->_maxy - (linesperregion + 1))
                                         break;
                                 wmove(wnd, row + linesperregion, 0);
                                 wdeleteln(wnd);
                                         break;
                                 wmove(wnd, row + linesperregion, 0);
                                 wdeleteln(wnd);
@@ -261,7 +255,6 @@ static
 stats(row, col, dn)
         int row, dn;
 {
 stats(row, col, dn)
         int row, dn;
 {
-        register i;
         double atime, words, xtime, itime;
 
         atime = s.dk_time[dn];
         double atime, words, xtime, itime;
 
         atime = s.dk_time[dn];
@@ -303,7 +296,7 @@ stat1(row, o)
                 time += s.cp_time[i];
         if (time == 0.0)
                 time = 1.0;
                 time += s.cp_time[i];
         if (time == 0.0)
                 time = 1.0;
-        wmove(wnd, row, 5);
+        wmove(wnd, row, INSET);
 #define CPUSCALE        0.5
         histogram(100 * s.cp_time[o] / time, 50, CPUSCALE);
 }
 #define CPUSCALE        0.5
         histogram(100 * s.cp_time[o] / time, 50, CPUSCALE);
 }
@@ -334,52 +327,17 @@ histogram(val, colwidth, scale)
 cmdiostat(cmd, args)
         char *cmd, *args;
 {
 cmdiostat(cmd, args)
         char *cmd, *args;
 {
-        int i;
 
 
-        if (prefix(cmd, "msps")) {
+        if (prefix(cmd, "msps"))
                 msps = !msps;
                 msps = !msps;
-                goto fixdisplay;
-        }
-        if (prefix(cmd, "numbers")) {
+       else if (prefix(cmd, "numbers"))
                 numbers = 1;
                 numbers = 1;
-                goto fixdisplay;
-        }
-        if (prefix(cmd, "bars")) {
+       else if (prefix(cmd, "bars"))
                 numbers = 0;
                 numbers = 0;
-                goto fixdisplay;
-        }
-        if (prefix(cmd, "display")) {
-                dkselect(args, 1, dk_select);
-                goto fixdisplay;
-        }
-        if (prefix(cmd, "ignore")) {
-                dkselect(args, 0, dk_select);
-                goto fixdisplay;
-        }
-        if (prefix(cmd, "drives")) {
-                move(CMDLINE, 0);
-                for (i = 0; i < DK_NDRIVE; i++)
-                        if (dk_mspw[i] != 0.0)
-                                printw("%s ", dr_name[i]);
-                return (1);
-        }
-        return (0);
-fixdisplay:
+       else if (!dkcmd(cmd, args))
+               return (0);
         wclear(wnd);
         wclear(wnd);
-        wrefresh(wnd);
         labeliostat();
         refresh();
         return (1);
 }
         labeliostat();
         refresh();
         return (1);
 }
-
-prefix(s1, s2)
-        register char *s1, *s2;
-{
-
-        while (*s1 == *s2) {
-                if (*s1 == '\0')
-                        return (1);
-                s1++, s2++;
-        }
-        return (*s1 == '\0');
-}
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.