lint; do not call logwakeup if paniced

[unix-history] / usr / src / sys / kern / subr_prf.c

diff --git a/usr/src/sys/kern/subr_prf.c b/usr/src/sys/kern/subr_prf.c
index 8fb0ea0..eda5336 100644 (file)
--- a/usr/src/sys/kern/subr_prf.c
+++ b/usr/src/sys/kern/subr_prf.c
@@ -1,11 +1,10 @@
 /*
 /*

- * Copyright (c) 1982, 1986 Regents of the University of California.
+ * Copyright (c) 1982, 1986, 1988 Regents of the University of California.

  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)subr_prf.c  7.5 (Berkeley) %G%
+ *     @(#)subr_prf.c  7.17 (Berkeley) %G%

  */
  */

-#include "../machine/mtpr.h"

 
 #include "param.h"
 #include "systm.h"
 
 #include "param.h"
 #include "systm.h"


@@ -15,13 +14,19 @@
 #include "reboot.h"
 #include "vm.h"
 #include "msgbuf.h"
 #include "reboot.h"
 #include "vm.h"
 #include "msgbuf.h"

-#include "dir.h"

 #include "user.h"
 #include "proc.h"
 #include "ioctl.h"
 #include "user.h"
 #include "proc.h"
 #include "ioctl.h"

+#include "vnode.h"
+#include "file.h"

 #include "tty.h"
 #include "syslog.h"
 
 #include "tty.h"
 #include "syslog.h"
 

+#include "machine/mtpr.h"
+#ifdef KADB
+#include "machine/kdbparam.h"
+#endif
+

 #define TOCONS 0x1
 #define TOTTY  0x2
 #define TOLOG  0x4
 #define TOCONS 0x1
 #define TOTTY  0x2
 #define TOLOG  0x4


@@ -34,9 +39,16 @@
 char   *panicstr;
 
 extern cnputc();                       /* standard console putc */
 char   *panicstr;
 
 extern cnputc();                       /* standard console putc */

+int    (*v_putc)() = cnputc;           /* routine to putc on virtual console */

 extern struct tty cons;                /* standard console tty */
 struct tty *constty;                   /* pointer to console "window" tty */
 extern struct tty cons;                /* standard console tty */
 struct tty *constty;                   /* pointer to console "window" tty */

-int    (*v_putc)() = cnputc;           /* routine to putc on virtual console */
+
+#ifdef KADB
+extern cngetc();                       /* standard console getc */
+extern cnpoll();
+int    (*v_getc)() = cngetc;           /* "" getc from virtual console */
+int    (*v_poll)() = cnpoll;           /* kdb hook to enable input polling */
+#endif

 
 extern cnputc();                       /* standard console putc */
 extern struct tty cons;                /* standard console tty */
 
 extern cnputc();                       /* standard console putc */
 extern struct tty cons;                /* standard console tty */


@@ -60,6 +72,15 @@ int  (*v_console)() = cnputc;        /* routine to putc on virtual console */
  *     printf("reg=%b\n", 3, "\10\2BITTWO\1BITONE\n");
  * would produce output:
  *     reg=3<BITTWO,BITONE>
  *     printf("reg=%b\n", 3, "\10\2BITTWO\1BITONE\n");
  * would produce output:
  *     reg=3<BITTWO,BITONE>

+ *
+ * Another additional format: %r is used to pass an additional format string
+ * and argument list recursively.  Usage is typically:
+ *
+ * fn(otherstuff, fmt [, arg1, ... ] )
+ *     char *fmt;
+ *     u_int arg1, ...;
+ *
+ *     printf("prefix: %r, other stuff\n", fmt, &arg1);

  */
 #if defined(tahoe)
 int    consintr;
  */
 #if defined(tahoe)
 int    consintr;


@@ -75,38 +96,29 @@ printf(fmt, x1)
 
        savintr = consintr, consintr = 0;       /* disable interrupts */
 #endif
 
        savintr = consintr, consintr = 0;       /* disable interrupts */
 #endif

-       prf(fmt, &x1, TOCONS | TOLOG, (struct tty *)0);
-       logwakeup();
+       prf(fmt, &x1, TOCONS | TOLOG, (caddr_t)0);
+       if (!panicstr)
+               logwakeup();

 #if defined(tahoe)
        consintr = savintr;                     /* reenable interrupts */
 #endif
 }
 
 /*
 #if defined(tahoe)
        consintr = savintr;                     /* reenable interrupts */
 #endif
 }
 
 /*

- * Uprintf prints to the current user's terminal.
+ * Uprintf prints to the controlling terminal for the current process.

  * It may block if the tty queue is overfull.
  * It may block if the tty queue is overfull.

- * Should determine whether current terminal user is related
- * to this process.
+ * No message is printed if the queue does not clear
+ * in a reasonable time.

  */
 /*VARARGS1*/
 uprintf(fmt, x1)
        char *fmt;
        unsigned x1;
 {
  */
 /*VARARGS1*/
 uprintf(fmt, x1)
        char *fmt;
        unsigned x1;
 {

-#ifdef notdef
-       register struct proc *p;
-#endif
-       register struct tty *tp;
+       register struct tty *tp = u.u_procp->p_session->s_ttyp;

 
 

-       if ((tp = u.u_ttyp) == NULL)
-               return;
-#ifdef notdef
-       if (tp->t_pgrp && (p = pfind(tp->t_pgrp)))
-               if (p->p_uid != u.u_uid)        /* doesn't account for setuid */
-                       return;
-#endif
-       (void)ttycheckoutq(tp, 1);
-       prf(fmt, &x1, TOTTY, tp);
+       if (tp != NULL && tp->t_session == u.u_procp->p_session)
+               prf(fmt, &x1, TOTTY, (caddr_t)tp);

 }
 
 /*
 }
 
 /*


@@ -116,23 +128,25 @@ uprintf(fmt, x1)
  * (does not sleep).
  */
 /*VARARGS2*/
  * (does not sleep).
  */
 /*VARARGS2*/

-tprintf(tp, fmt, x1)
-       register struct tty *tp;
+tprintf(vp, fmt, x1)
+       register caddr_t vp;

        char *fmt;
        unsigned x1;
 {
        char *fmt;
        unsigned x1;
 {

+#ifdef notyet

        int flags = TOTTY | TOLOG;
 
        logpri(LOG_INFO);
        int flags = TOTTY | TOLOG;
 
        logpri(LOG_INFO);

-       if (tp == (struct tty *)NULL) {
-               tp = constty;
-               if (tp == (struct tty *)NULL)
-                       tp = &cons;
-       }
-       if (ttycheckoutq(tp, 0) == 0)
+
+       if (vp == NULL || 
+           VOP_IOCTL(vp, TIOCCHECKOUTQ, &val, FWRITE, NOCRED) != 0 || 
+           val == 0)

                flags = TOLOG;
                flags = TOLOG;

-       prf(fmt, &x1, flags, tp);
+       prf(fmt, &x1, flags, vp);

        logwakeup();
        logwakeup();

+#else
+       printf("tprintf called\n");
+#endif

 }
 
 /*
 }
 
 /*


@@ -149,10 +163,10 @@ log(level, fmt, x1)
        extern int log_open;
 
        logpri(level);
        extern int log_open;
 
        logpri(level);

-       prf(fmt, &x1, TOLOG, (struct tty *)0);
+       prf(fmt, &x1, TOLOG, (caddr_t)0);

        splx(s);
        if (!log_open)
        splx(s);
        if (!log_open)

-               prf(fmt, &x1, TOCONS, (struct tty *)0);
+               prf(fmt, &x1, TOCONS, (caddr_t)0);

        logwakeup();
 }
 
        logwakeup();
 }
 


@@ -160,15 +174,29 @@ logpri(level)
        int level;
 {
 
        int level;
 {
 

-       putchar('<', TOLOG, (struct tty *)0);
-       printn((u_long)level, 10, TOLOG, (struct tty *)0);
-       putchar('>', TOLOG, (struct tty *)0);
+       putchar('<', TOLOG, (caddr_t)0);
+       printn((u_long)level, 10, TOLOG, (caddr_t)0);
+       putchar('>', TOLOG, (caddr_t)0);
+}
+
+/*VARARGS1*/
+addlog(fmt, x1)
+       char *fmt;
+       unsigned x1;
+{
+       register s = splhigh();
+
+       prf(fmt, &x1, TOLOG, (caddr_t)0);
+       splx(s);
+       if (!log_open)
+               prf(fmt, &x1, TOCONS, (caddr_t)0);
+       logwakeup();

 }
 
 }
 

-prf(fmt, adx, flags, ttyp)
+prf(fmt, adx, flags, where)

        register char *fmt;
        register u_int *adx;
        register char *fmt;
        register u_int *adx;

-       struct tty *ttyp;
+       caddr_t where;

 {
        register int b, c, i;
        char *s;
 {
        register int b, c, i;
        char *s;


@@ -178,7 +206,7 @@ loop:
        while ((c = *fmt++) != '%') {
                if (c == '\0')
                        return;
        while ((c = *fmt++) != '%') {
                if (c == '\0')
                        return;

-               putchar(c, flags, ttyp);
+               putchar(c, flags, where);

        }
 again:
        c = *fmt++;
        }
 again:
        c = *fmt++;


@@ -199,49 +227,54 @@ again:
        case 'o': case 'O':
                b = 8;
 number:
        case 'o': case 'O':
                b = 8;
 number:

-               printn((u_long)*adx, b, flags, ttyp);
+               printn((u_long)*adx, b, flags, where);

                break;
        case 'c':
                b = *adx;
                break;
        case 'c':
                b = *adx;

-#if ENDIAN == LITTLE
+#if BYTE_ORDER == LITTLE_ENDIAN

                for (i = 24; i >= 0; i -= 8)
                        if (c = (b >> i) & 0x7f)
                for (i = 24; i >= 0; i -= 8)
                        if (c = (b >> i) & 0x7f)

-                               putchar(c, flags, ttyp);
+                               putchar(c, flags, where);

 #endif
 #endif

-#if ENDIAN == BIG
+#if BYTE_ORDER == BIG_ENDIAN

                if (c = (b & 0x7f))
                if (c = (b & 0x7f))

-                       putchar(c, flags, ttyp);
+                       putchar(c, flags, where);

 #endif
                break;
        case 'b':
                b = *adx++;
                s = (char *)*adx;
 #endif
                break;
        case 'b':
                b = *adx++;
                s = (char *)*adx;

-               printn((u_long)b, *s++, flags, ttyp);
+               printn((u_long)b, *s++, flags, where);

                any = 0;
                if (b) {
                        while (i = *s++) {
                                if (b & (1 << (i-1))) {
                any = 0;
                if (b) {
                        while (i = *s++) {
                                if (b & (1 << (i-1))) {

-                                       putchar(any ? ',' : '<', flags, ttyp);
+                                       putchar(any ? ',' : '<', flags, where);

                                        any = 1;
                                        for (; (c = *s) > 32; s++)
                                        any = 1;
                                        for (; (c = *s) > 32; s++)

-                                               putchar(c, flags, ttyp);
+                                               putchar(c, flags, where);

                                } else
                                        for (; *s > 32; s++)
                                                ;
                        }
                        if (any)
                                } else
                                        for (; *s > 32; s++)
                                                ;
                        }
                        if (any)

-                               putchar('>', flags, ttyp);
+                               putchar('>', flags, where);

                }
                break;
 
        case 's':
                s = (char *)*adx;
                while (c = *s++)
                }
                break;
 
        case 's':
                s = (char *)*adx;
                while (c = *s++)

-                       putchar(c, flags, ttyp);
+                       putchar(c, flags, where);
+               break;
+
+       case 'r':
+               s = (char *)*adx++;
+               prf(s, (u_int *)*adx, flags, where);

                break;
 
        case '%':
                break;
 
        case '%':

-               putchar('%', flags, ttyp);
+               putchar('%', flags, where);

                break;
        }
        adx++;
                break;
        }
        adx++;


@@ -252,16 +285,16 @@ number:
  * Printn prints a number n in base b.
  * We don't use recursion to avoid deep kernel stacks.
  */
  * Printn prints a number n in base b.
  * We don't use recursion to avoid deep kernel stacks.
  */

-printn(n, b, flags, ttyp)
+printn(n, b, flags, where)

        u_long n;
        u_long n;

-       struct tty *ttyp;
+       caddr_t where;

 {
        char prbuf[11];
        register char *cp;
 
        if (b == -10) {
                if ((int)n < 0) {
 {
        char prbuf[11];
        register char *cp;
 
        if (b == -10) {
                if ((int)n < 0) {

-                       putchar('-', flags, ttyp);
+                       putchar('-', flags, where);

                        n = (unsigned)(-(int)n);
                }
                b = -b;
                        n = (unsigned)(-(int)n);
                }
                b = -b;


@@ -272,7 +305,7 @@ printn(n, b, flags, ttyp)
                n /= b;
        } while (n);
        do
                n /= b;
        } while (n);
        do

-               putchar(*--cp, flags, ttyp);
+               putchar(*--cp, flags, where);

        while (cp > prbuf);
 }
 
        while (cp > prbuf);
 }
 


@@ -293,6 +326,14 @@ panic(s)
                panicstr = s;
        }
        printf("panic: %s\n", s);
                panicstr = s;
        }
        printf("panic: %s\n", s);

+#ifdef KADB
+       if (boothowto & RB_KDB) {
+               int x = splnet();       /* below kdb pri */
+
+               setsoftkdb();
+               splx(x);
+       }
+#endif

        boot(bootopt);
 }
 
        boot(bootopt);
 }
 


@@ -306,60 +347,33 @@ tablefull(tab)
        log(LOG_ERR, "%s: table is full\n", tab);
 }
 
        log(LOG_ERR, "%s: table is full\n", tab);
 }
 

-/*
- * Hard error is the preface to plaintive error messages
- * about failing disk transfers.
- */
-harderr(bp, cp)
-       struct buf *bp;
-       char *cp;
-{
-
-       printf("%s%d%c: hard error sn%d ", cp,
-           minor(bp->b_dev) >> 3, 'a'+(minor(bp->b_dev)&07), bp->b_blkno);
-}
-

 /*
  * Print a character on console or users terminal.
  * If destination is console then the last MSGBUFS characters
  * are saved in msgbuf for inspection later.
  */
 /*ARGSUSED*/
 /*
  * Print a character on console or users terminal.
  * If destination is console then the last MSGBUFS characters
  * are saved in msgbuf for inspection later.
  */
 /*ARGSUSED*/

-putchar(c, flags, tp)
+putchar(c, flags, where)

        register int c;
        register int c;

-       struct tty *tp;
+       caddr_t where;

 {
 {

-       int startflags = flags;
+       extern int msgbufmapped;

 
        if (panicstr)
                constty = 0;
 
        if (panicstr)
                constty = 0;

-       if ((flags & TOCONS) && tp == 0 && constty) {
-               tp = constty;
+       if ((flags & TOCONS) && where == 0 && constty) {
+               where = (caddr_t)constty;

                flags |= TOTTY;
        }
        if ((flags & TOCONS) && panicstr == 0 && tp == 0 && constty) {
                tp = constty;
                flags |= TOTTY;
        }
                flags |= TOTTY;
        }
        if ((flags & TOCONS) && panicstr == 0 && tp == 0 && constty) {
                tp = constty;
                flags |= TOTTY;
        }

-       if (flags & TOTTY) {
-               register s = spltty();
-
-               if (tp && (tp->t_state & (TS_CARR_ON | TS_ISOPEN)) ==
-                   (TS_CARR_ON | TS_ISOPEN)) {
-                       if (c == '\n')
-                               (void) ttyoutput('\r', tp);
-                       (void) ttyoutput(c, tp);
-                       ttstart(tp);
-                       flags &= ~TOCONS;
-               } else if ((flags & TOCONS) && tp == constty)
-                       constty = 0;
-               splx(s);
-       }
-       /*
-        * Can send to log only after memory management enabled:
-        * this has happened by the time maxmem is set.
-        */
-       if ((flags & TOLOG) && c != '\0' && c != '\r' && c != 0177 && maxmem) {
+       if ((flags & TOTTY) && where && tputchar(c, (struct tty *)where) < 0 &&
+           (flags & TOCONS) && (struct tty *)where == constty)
+               constty = 0;
+       if ((flags & TOLOG) && c != '\0' && c != '\r' && c != 0177 &&
+           msgbufmapped) {

                if (msgbuf.msg_magic != MSG_MAGIC) {
                        register int i;
 
                if (msgbuf.msg_magic != MSG_MAGIC) {
                        register int i;