"s," "t," and "T" moved to long commands (iostat, time).

"S" removed.

SCCS-vsn: usr.bin/window/cmd.c 3.24
SCCS-vsn: usr.bin/window/cmd2.c 3.25
SCCS-vsn: usr.bin/window/defs.h 3.13
SCCS-vsn: usr.bin/window/cmd4.c 3.10
SCCS-vsn: usr.bin/window/lcmd.c 3.15

diff --git a/usr/src/usr.bin/window/cmd.c b/usr/src/usr.bin/window/cmd.c
index 5797488..f9e7490 100644 (file)
--- a/usr/src/usr.bin/window/cmd.c
+++ b/usr/src/usr.bin/window/cmd.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)cmd.c       3.23 84/04/05";
+static char *sccsid = "@(#)cmd.c       3.24 84/04/05";

 #endif
 
 #include "defs.h"
 #endif
 
 #include "defs.h"


@@ -77,9 +77,6 @@ docmd()
                                        movewin(w, w->ww_altpos.r,
                                                w->ww_altpos.c);
                                break;
                                        movewin(w, w->ww_altpos.r,
                                                w->ww_altpos.c);
                                break;

-                       case 'S':
-                               c_show();
-                               break;

                        case 'L':
                                c_list();
                                break;
                        case 'L':
                                c_list();
                                break;


@@ -143,18 +140,6 @@ docmd()
                        case 'q':
                                c_quit();
                                break;
                        case 'q':
                                c_quit();
                                break;

-                       /* undocumented commands */
-                       case 's':
-                               c_stat();
-                               break;
-#ifndef O_4_1A
-                       case 't':
-                               c_time(RUSAGE_SELF);
-                               break;
-                       case 'T':
-                               c_time(RUSAGE_CHILDREN);
-                               break;
-#endif

                        /* debugging stuff */
                        case '&':
                                if (debug) {
                        /* debugging stuff */
                        case '&':
                                if (debug) {

diff --git a/usr/src/usr.bin/window/cmd2.c b/usr/src/usr.bin/window/cmd2.c
index 8efefa9..8907b32 100644 (file)
--- a/usr/src/usr.bin/window/cmd2.c
+++ b/usr/src/usr.bin/window/cmd2.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)cmd2.c      3.24 84/04/05";
+static char *sccsid = "@(#)cmd2.c      3.25 84/04/05";

 #endif
 
 #include "defs.h"
 #endif
 
 #include "defs.h"


@@ -82,107 +82,6 @@ register char **list;
        return more(w, 1) == 2 ? -1 : 0;
 }
 
        return more(w, 1) == 2 ? -1 : 0;
 }
 

-#ifndef O_4_1A
-char *strtime();
-
-c_time(flag)
-{
-       register struct ww *w;
-       struct rusage rusage;
-       struct timeval timeval;
-
-       if ((w = openiwin(6, "Timing and Resource Usage")) == 0) {
-               error("Can't open time window: %s.", wwerror());
-               return;
-       }
-
-       (void) gettimeofday(&timeval, (struct timezone *)0);
-       timeval.tv_sec -= starttime.tv_sec;
-       if ((timeval.tv_usec -= starttime.tv_usec) < 0) {
-               timeval.tv_sec--;
-               timeval.tv_usec += 1000000;
-       }
-       (void) getrusage(flag, &rusage);
-
-       wwprintf(w, "time\t\tutime\t\tstime\t\tmaxrss\tixrss\tidrss\tisrss\n");
-       wwprintf(w, "%-16s", strtime(&timeval));
-       wwprintf(w, "%-16s", strtime(&rusage.ru_utime));
-       wwprintf(w, "%-16s", strtime(&rusage.ru_stime));
-       wwprintf(w, "%D\t%D\t%D\t%D\n",
-               rusage.ru_maxrss, rusage.ru_ixrss,
-               rusage.ru_idrss, rusage.ru_isrss);
-       wwprintf(w, "minflt\tmajflt\tnswap\tinblk\toublk\tmsgsnd\tmsgrcv\tnsigs\tnvcsw\tnivcsw\n");
-       wwprintf(w, "%D\t%D\t%D\t%D\t%D\t%D\t%D\t%D\t%D\t%D\n",
-               rusage.ru_minflt, rusage.ru_majflt, rusage.ru_nswap,
-               rusage.ru_inblock, rusage.ru_oublock,
-               rusage.ru_msgsnd, rusage.ru_msgrcv, rusage.ru_nsignals,
-               rusage.ru_nvcsw, rusage.ru_nivcsw);
-
-       waitnl(w);
-       closeiwin(w);
-}
-
-char *
-strtime(t)
-register struct timeval *t;
-{
-       char fill = 0;
-       static char buf[20];
-       register char *p = buf;
-
-       if (t->tv_sec > 60*60) {
-               (void) sprintf(p, "%D:", t->tv_sec / (60*60));
-               while (*p++)
-                       ;
-               p--;
-               t->tv_sec %= 60*60;
-               fill++;
-       }
-       if (t->tv_sec > 60) {
-               (void) sprintf(p, fill ? "%02D:" : "%D:", t->tv_sec / 60);
-               while (*p++)
-                       ;
-               p--;
-               t->tv_sec %= 60;
-               fill++;
-       }
-       (void) sprintf(p, fill ? "%02D.%02d" : "%D.%02D",
-               t->tv_sec, t->tv_usec / 10000);
-       return buf;
-}
-#endif
-
-c_stat()
-{
-       register struct ww *w;
-
-       if ((w = openiwin(14, "IO Statistics")) == 0) {
-               error("Can't open statistics window: %s.", wwerror());
-               return;
-       }
-       wwprintf(w, "ttflush\twrite\terror\tzero\tchar\n");
-       wwprintf(w, "%d\t%d\t%d\t%d\t%d\n",
-               wwnflush, wwnwr, wwnwre, wwnwrz, wwnwrc);
-       wwprintf(w, "wwwrite\tattmpt\tchar\n");
-       wwprintf(w, "%d\t%d\t%d\n",
-               wwnwwr, wwnwwra, wwnwwrc);
-       wwprintf(w, "wwupdat\tline\tmiss\tmajor\tmiss\n");
-       wwprintf(w, "%d\t%d\t%d\t%d\t%d\n",
-               wwnupdate, wwnupdline, wwnupdmiss, wwnmajline, wwnmajmiss);
-       wwprintf(w, "select\terror\tzero\n");
-       wwprintf(w, "%d\t%d\t%d\n",
-               wwnselect, wwnselecte, wwnselectz);
-       wwprintf(w, "read\terror\tzero\tchar\n");
-       wwprintf(w, "%d\t%d\t%d\t%d\n",
-               wwnread, wwnreade, wwnreadz, wwnreadc);
-       wwprintf(w, "ptyread\terror\tzero\tcontrol\tdata\tchar\n");
-       wwprintf(w, "%d\t%d\t%d\t%d\t%d\t%d\n",
-               wwnwread, wwnwreade, wwnwreadz,
-               wwnwreadp, wwnwreadd, wwnwreadc);
-       waitnl(w);
-       closeiwin(w);
-}
-

 c_list()
 {
        register struct ww *w, *wp;
 c_list()
 {
        register struct ww *w, *wp;

diff --git a/usr/src/usr.bin/window/cmd4.c b/usr/src/usr.bin/window/cmd4.c
index 41db355..0554dd8 100644 (file)
--- a/usr/src/usr.bin/window/cmd4.c
+++ b/usr/src/usr.bin/window/cmd4.c
@@ -1,60 +1,9 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)cmd4.c      3.9 84/04/05";
+static char *sccsid = "@(#)cmd4.c      3.10 84/04/05";

 #endif
 
 #include "defs.h"
 
 #endif
 
 #include "defs.h"
 

-c_show()
-{
-       register i;
-       register struct ww *w = 0;
-       char done_it = 0;
-
-       for (i = 0; i < NWINDOW; i++) {
-               if ((w = window[i]) == 0)
-                       continue;
-               done_it++;
-               if (!terse && cmdwin->ww_order < framewin->ww_order) {
-                       wwdelete(cmdwin);
-                       wwadd(cmdwin, framewin);
-               }
-               front(w, 0);
-               wwsetcursor(w->ww_w.t - 1, w->ww_w.l + 1);
-               for (;;) {
-                       switch (wwgetc()) {
-                       case '\r':
-                       case '\n':
-                               break;
-                       case CTRL([):
-                               setselwin(w);
-                               goto out;
-                       case -1:
-                               wwiomux();
-                               continue;
-                       default:
-                               wwputc(CTRL(g), cmdwin);
-                               if (!terse) {
-                                       wwputs("\rType return to continue, escape to select.", cmdwin);
-                                       wwdelete(cmdwin);
-                                       wwadd(cmdwin, &wwhead);
-                               }
-                               continue;
-                       }
-                       break;
-               }
-       }
-out:
-       if (!done_it) {
-               error("No windows.");
-       } else {
-               if (!terse) {
-                       wwdelete(cmdwin);
-                       wwadd(cmdwin, &wwhead);
-                       wwputs("\r\n", cmdwin);
-               }
-       }
-}
-

 c_colon()
 {
        char oldterse = terse;
 c_colon()
 {
        char oldterse = terse;

diff --git a/usr/src/usr.bin/window/defs.h b/usr/src/usr.bin/window/defs.h
index 035ed42..ff8730f 100644 (file)
--- a/usr/src/usr.bin/window/defs.h
+++ b/usr/src/usr.bin/window/defs.h
@@ -1,18 +1,13 @@
 /*
 /*

- *     @(#)defs.h      3.12 84/04/05   
+ *     @(#)defs.h      3.13 84/04/05   

  */
 
 #include "ww.h"
  */
 
 #include "ww.h"

-#ifndef O_4_1A

 #include <sys/time.h>
 #include <sys/time.h>

-#include <sys/resource.h>
-#endif

 
 #define NWINDOW 9
 
 
 #define NWINDOW 9
 

-#ifndef O_4_1A

 struct timeval starttime;
 struct timeval starttime;

-#endif

 
 struct ww *window[NWINDOW];    /* the windows */
 struct ww *selwin;             /* the selected window */
 
 struct ww *window[NWINDOW];    /* the windows */
 struct ww *selwin;             /* the selected window */

diff --git a/usr/src/usr.bin/window/lcmd.c b/usr/src/usr.bin/window/lcmd.c
index 38dcfc1..0d8dec4 100644 (file)
--- a/usr/src/usr.bin/window/lcmd.c
+++ b/usr/src/usr.bin/window/lcmd.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)lcmd.c      3.14 84/04/05";
+static char *sccsid = "@(#)lcmd.c      3.15 84/04/05";

 #endif
 
 #include "defs.h"
 #endif
 
 #include "defs.h"


@@ -12,10 +12,12 @@ int l_cursormodes();
 int l_debug();
 int l_escape();
 int l_foreground();
 int l_debug();
 int l_escape();
 int l_foreground();

+int l_iostat();

 int l_label();
 int l_select();
 int l_source();
 int l_terse();
 int l_label();
 int l_select();
 int l_source();
 int l_terse();

+int l_time();

 int l_unset();
 int l_window();
 int l_write();
 int l_unset();
 int l_window();
 int l_write();


@@ -26,10 +28,12 @@ struct lcmd_arg arg_cursormodes[];
 struct lcmd_arg arg_debug[];
 struct lcmd_arg arg_escape[];
 struct lcmd_arg arg_foreground[];
 struct lcmd_arg arg_debug[];
 struct lcmd_arg arg_escape[];
 struct lcmd_arg arg_foreground[];

+struct lcmd_arg arg_iostat[];

 struct lcmd_arg arg_label[];
 struct lcmd_arg arg_select[];
 struct lcmd_arg arg_source[];
 struct lcmd_arg arg_terse[];
 struct lcmd_arg arg_label[];
 struct lcmd_arg arg_select[];
 struct lcmd_arg arg_source[];
 struct lcmd_arg arg_terse[];

+struct lcmd_arg arg_time[];

 struct lcmd_arg arg_unset[];
 struct lcmd_arg arg_window[];
 struct lcmd_arg arg_write[];
 struct lcmd_arg arg_unset[];
 struct lcmd_arg arg_window[];
 struct lcmd_arg arg_write[];


@@ -42,10 +46,12 @@ struct lcmd_tab lcmd_tab[] = {
        "debug",        1,      l_debug,        arg_debug,
        "escape",       1,      l_escape,       arg_escape,
        "foreground",   1,      l_foreground,   arg_foreground,
        "debug",        1,      l_debug,        arg_debug,
        "escape",       1,      l_escape,       arg_escape,
        "foreground",   1,      l_foreground,   arg_foreground,

+       "iostat",       1,      l_iostat,       arg_iostat,

        "label",        1,      l_label,        arg_label,
        "select",       2,      l_select,       arg_select,
        "source",       2,      l_source,       arg_source,
        "label",        1,      l_label,        arg_label,
        "select",       2,      l_select,       arg_select,
        "source",       2,      l_source,       arg_source,

-       "terse",        1,      l_terse,        arg_terse,
+       "terse",        2,      l_terse,        arg_terse,
+       "time",         2,      l_time,         arg_time,

        "unset",        1,      l_unset,        arg_unset,
        "window",       2,      l_window,       arg_window,
        "write",        2,      l_write,        arg_write,
        "unset",        1,      l_unset,        arg_unset,
        "window",       2,      l_window,       arg_window,
        "write",        2,      l_write,        arg_write,