BSD 4_3_Reno release

[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 903a7d7..4b13fcd 100644 (file)
--- a/usr/src/sys/kern/subr_prf.c
+++ b/usr/src/sys/kern/subr_prf.c
@@ -3,7 +3,7 @@
  * 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.9 (Berkeley) %G%
+ *     @(#)subr_prf.c  7.18 (Berkeley) 6/28/90

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -14,16 +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 "tty.h"

+#include "tprintf.h"

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

+#include "malloc.h"

 
 

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

 #endif
 
 #define TOCONS 0x1
 #endif
 
 #define TOCONS 0x1


@@ -38,14 +41,16 @@
 char   *panicstr;
 
 extern cnputc();                       /* standard console putc */
 char   *panicstr;
 
 extern cnputc();                       /* standard console putc */

-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 */
 int    (*v_putc)() = cnputc;           /* routine to putc on virtual console */

-
-extern cnputc();                       /* standard console putc */

 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_console)() = 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

 
 /*
  * Scaled down version of C Library printf.
 
 /*
  * Scaled down version of C Library printf.


@@ -64,6 +69,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;


@@ -79,68 +93,71 @@ 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, (struct tty *)NULL);
+       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.
  * No message is printed if the queue does not clear
  * in a reasonable time.
  * It may block if the tty queue is overfull.
  * No message is printed if the queue does not clear
  * in a reasonable time.

- * Should determine whether current terminal user is related
- * to this process.

  */
 /*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 proc *p = u.u_procp;

 
 

-       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
-       if (ttycheckoutq(tp, 1))
-               prf(fmt, &x1, TOTTY, tp);
+       if (p->p_flag & SCTTY && p->p_session->s_ttyvp)
+               prf(fmt, &x1, TOTTY, p->p_session->s_ttyp);
+}
+
+tpr_t
+tprintf_open()
+{
+       register struct proc *p = u.u_procp;
+
+       if (p->p_flag & SCTTY && p->p_session->s_ttyvp) {
+               SESSHOLD(p->p_session);
+               return ((tpr_t)p->p_session);
+       } else
+               return ((tpr_t)NULL);
+}
+
+tprintf_close(sess)
+       tpr_t sess;
+{
+       if (sess)
+               SESSRELE(sess);

 }
 
 /*
 }
 
 /*

- * tprintf prints on the specified terminal (console if none)
- * and logs the message.  It is designed for error messages from
- * single-open devices, and may be called from interrupt level
- * (does not sleep).
+ * tprintf prints on the controlling terminal associated
+ * with the given session.  

  */
 /*VARARGS2*/
  */
 /*VARARGS2*/

-tprintf(tp, fmt, x1)
-       register struct tty *tp;
+tprintf(sess, fmt, x1)
+       register tpr_t sess;

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

-       int flags = TOTTY | TOLOG;
+       int flags = TOLOG;

 
        logpri(LOG_INFO);
 
        logpri(LOG_INFO);

-       if (tp == (struct tty *)NULL) {
-               tp = constty;
-               if (tp == (struct tty *)NULL)
-                       tp = &cons;
-       }
-       if (ttycheckoutq(tp, 0) == 0)
-               flags = TOLOG;
-       prf(fmt, &x1, flags, tp);
+
+       if (sess && sess->s_ttyvp && ttycheckoutq(sess->s_ttyp, 0))
+               flags |= TOTTY;
+       prf(fmt, &x1, flags, sess->s_ttyp);

        logwakeup();
 }
 
        logwakeup();
 }
 

+

 /*
  * Log writes to the log buffer,
  * and guarantees not to sleep (so can be called by interrupt routines).
 /*
  * Log writes to the log buffer,
  * and guarantees not to sleep (so can be called by interrupt routines).


@@ -155,10 +172,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, (struct tty *)NULL);

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

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

        logwakeup();
 }
 
        logwakeup();
 }
 


@@ -166,9 +183,9 @@ 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, (struct tty *)NULL);
+       printn((u_long)level, 10, TOLOG, (struct tty *)NULL);
+       putchar('>', TOLOG, (struct tty *)NULL);

 }
 
 /*VARARGS1*/
 }
 
 /*VARARGS1*/


@@ -178,10 +195,10 @@ addlog(fmt, x1)
 {
        register s = splhigh();
 
 {
        register s = splhigh();
 

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

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

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

        logwakeup();
 }
 
        logwakeup();
 }
 


@@ -262,7 +279,7 @@ number:
 
        case 'r':
                s = (char *)*adx++;
 
        case 'r':
                s = (char *)*adx++;

-               prf(s, *adx, flags, ttyp);
+               prf(s, (u_int *)*adx, flags, ttyp);

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


@@ -318,7 +335,7 @@ panic(s)
                panicstr = s;
        }
        printf("panic: %s\n", s);
                panicstr = s;
        }
        printf("panic: %s\n", s);

-#ifdef KDB
+#ifdef KADB

        if (boothowto & RB_KDB) {
                int x = splnet();       /* below kdb pri */
 
        if (boothowto & RB_KDB) {
                int x = splnet();       /* below kdb pri */
 


@@ -339,55 +356,27 @@ 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, ttyp)

        register int c;
        register int c;

-       struct tty *tp;
+       struct tty *ttyp;

 {
        extern int msgbufmapped;
 
        if (panicstr)
                constty = 0;
 {
        extern int msgbufmapped;
 
        if (panicstr)
                constty = 0;

-       if ((flags & TOCONS) && tp == 0 && constty) {
-               tp = constty;
+       if ((flags & TOCONS) && ttyp == NULL && constty) {
+               ttyp = 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);
-       }
+       if ((flags & TOTTY) && ttyp && tputchar(c, ttyp) < 0 &&
+           (flags & TOCONS) && ttyp == constty)
+               constty = 0;

        if ((flags & TOLOG) && c != '\0' && c != '\r' && c != 0177 &&
            msgbufmapped) {
                if (msgbuf.msg_magic != MSG_MAGIC) {
        if ((flags & TOLOG) && c != '\0' && c != '\r' && c != 0177 &&
            msgbufmapped) {
                if (msgbuf.msg_magic != MSG_MAGIC) {


@@ -402,5 +391,6 @@ putchar(c, flags, tp)
                if (msgbuf.msg_bufx < 0 || msgbuf.msg_bufx >= MSG_BSIZE)
                        msgbuf.msg_bufx = 0;
        }
                if (msgbuf.msg_bufx < 0 || msgbuf.msg_bufx >= MSG_BSIZE)
                        msgbuf.msg_bufx = 0;
        }

-               (*v_console)(c);
+       if ((flags & TOCONS) && constty == 0 && c != '\0')
+               (*v_putc)(c);

 }
 }