summaryrefslogtreecommitdiff
path: root/sys/kern/subr_prf.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/kern/subr_prf.c')
-rw-r--r--sys/kern/subr_prf.c207
1 files changed, 132 insertions, 75 deletions
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index e8d523e393d8..c554fe98b736 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -49,6 +49,7 @@
#include <sys/tprintf.h>
#include <sys/syslog.h>
#include <sys/cons.h>
+#include <sys/uio.h>
/*
* Note that stdarg.h and the ANSI style va_start macro is used for both
@@ -65,6 +66,7 @@
struct putchar_arg {
int flags;
+ int pri;
struct tty *tty;
};
@@ -73,11 +75,13 @@ struct snprintf_arg {
size_t remain;
};
+extern int log_open;
+
struct tty *constty; /* pointer to console "window" tty */
static void (*v_putc)(int) = cnputc; /* routine to putc on virtual console */
-static void logpri __P((int level));
-static void msglogchar(int c, void *dummyarg);
+static void msglogchar(int c, int pri);
+static void msgaddchar(int c, void *dummy);
static void putchar __P((int ch, void *arg));
static char *ksprintn __P((char *nbuf, u_long num, int base, int *len));
static char *ksprintqn __P((char *nbuf, u_quad_t num, int base, int *len));
@@ -85,13 +89,13 @@ static void snprintf_func __P((int ch, void *arg));
static int consintr = 1; /* Ok to handle console interrupts? */
static int msgbufmapped; /* Set when safe to use msgbuf */
+int msgbuftrigger;
/*
* Warn that a system table is full.
*/
void
-tablefull(tab)
- const char *tab;
+tablefull(const char *tab)
{
log(LOG_ERR, "%s: table is full\n", tab);
@@ -110,7 +114,8 @@ uprintf(const char *fmt, ...)
struct putchar_arg pca;
int retval = 0;
- if (p->p_flag & P_CONTROLT && p->p_session->s_ttyvp) {
+ if (p && p->p_flag & P_CONTROLT &&
+ p->p_session->s_ttyvp) {
va_start(ap, fmt);
pca.tty = p->p_session->s_ttyp;
pca.flags = TOTTY;
@@ -155,7 +160,6 @@ tprintf(tpr_t tpr, const char *fmt, ...)
struct putchar_arg pca;
int retval;
- logpri(LOG_INFO);
if (sess && sess->s_ttyvp && ttycheckoutq(sess->s_ttyp, 0)) {
flags |= TOTTY;
tp = sess->s_ttyp;
@@ -163,9 +167,10 @@ tprintf(tpr_t tpr, const char *fmt, ...)
va_start(ap, fmt);
pca.tty = tp;
pca.flags = flags;
+ pca.pri = LOG_INFO;
retval = kvprintf(fmt, putchar, &pca, 10, ap);
va_end(ap);
- logwakeup();
+ msgbuftrigger = 1;
return retval;
}
@@ -189,8 +194,6 @@ ttyprintf(struct tty *tp, const char *fmt, ...)
return retval;
}
-extern int log_open;
-
/*
* Log writes to the log buffer, and guarantees not to sleep (so can be
* called by interrupt routines). If there is no process reading the
@@ -199,72 +202,88 @@ extern int log_open;
int
log(int level, const char *fmt, ...)
{
- register int s;
va_list ap;
int retval;
+ struct putchar_arg pca;
- s = splhigh();
- logpri(level);
- va_start(ap, fmt);
+ pca.tty = NULL;
+ pca.pri = level;
+ pca.flags = log_open ? TOLOG : TOCONS;
- retval = kvprintf(fmt, msglogchar, NULL, 10, ap);
+ va_start(ap, fmt);
+ retval = kvprintf(fmt, putchar, &pca, 10, ap);
va_end(ap);
- splx(s);
- if (!log_open) {
- struct putchar_arg pca;
- va_start(ap, fmt);
- pca.tty = NULL;
- pca.flags = TOCONS;
- retval += kvprintf(fmt, putchar, &pca, 10, ap);
- va_end(ap);
- }
- logwakeup();
- return retval;
-}
-
-static void
-logpri(level)
- int level;
-{
- char nbuf[MAXNBUF];
- register char *p;
-
- msglogchar('<', NULL);
- for (p = ksprintn(nbuf, (u_long)level, 10, NULL); *p;)
- msglogchar(*p--, NULL);
- msglogchar('>', NULL);
+ msgbuftrigger = 1;
+ return (retval);
}
int
addlog(const char *fmt, ...)
{
- register int s;
va_list ap;
int retval;
+ struct putchar_arg pca;
+
+ pca.tty = NULL;
+ pca.pri = -1;
+ pca.flags = log_open ? TOLOG : TOCONS;
- s = splhigh();
va_start(ap, fmt);
- retval = kvprintf(fmt, msglogchar, NULL, 10, ap);
- splx(s);
+ retval = kvprintf(fmt, putchar, &pca, 10, ap);
va_end(ap);
- if (!log_open) {
- struct putchar_arg pca;
- va_start(ap, fmt);
- pca.tty = NULL;
- pca.flags = TOCONS;
- retval += kvprintf(fmt, putchar, &pca, 10, ap);
- va_end(ap);
- }
- logwakeup();
+
+ msgbuftrigger = 1;
return (retval);
}
+#define CONSCHUNK 128
+
+void
+log_console(struct uio *uio)
+{
+ int c, i, error, iovlen, nl;
+ struct uio muio;
+ struct iovec *miov = NULL;
+ char *consbuffer;
+ int pri;
+
+ pri = LOG_INFO | LOG_CONSOLE;
+ muio = *uio;
+ iovlen = uio->uio_iovcnt * sizeof (struct iovec);
+ MALLOC(miov, struct iovec *, iovlen, M_TEMP, M_WAITOK);
+ MALLOC(consbuffer, char *, CONSCHUNK, M_TEMP, M_WAITOK);
+ bcopy((caddr_t)muio.uio_iov, (caddr_t)miov, iovlen);
+ muio.uio_iov = miov;
+ uio = &muio;
+
+ nl = 0;
+ while (uio->uio_resid > 0) {
+ c = imin(uio->uio_resid, CONSCHUNK);
+ error = uiomove(consbuffer, c, uio);
+ if (error != 0)
+ return;
+ for (i = 0; i < c; i++) {
+ msglogchar(consbuffer[i], pri);
+ if (consbuffer[i] == '\n')
+ nl = 1;
+ else
+ nl = 0;
+ }
+ }
+ if (!nl)
+ msglogchar('\n', pri);
+ msgbuftrigger = 1;
+ FREE(miov, M_TEMP);
+ FREE(consbuffer, M_TEMP);
+ return;
+}
+
int
printf(const char *fmt, ...)
{
va_list ap;
- register int savintr;
+ int savintr;
struct putchar_arg pca;
int retval;
@@ -273,10 +292,11 @@ printf(const char *fmt, ...)
va_start(ap, fmt);
pca.tty = NULL;
pca.flags = TOCONS | TOLOG;
+ pca.pri = -1;
retval = kvprintf(fmt, putchar, &pca, 10, ap);
va_end(ap);
if (!panicstr)
- logwakeup();
+ msgbuftrigger = 1;
consintr = savintr; /* reenable interrupts */
return retval;
}
@@ -284,7 +304,7 @@ printf(const char *fmt, ...)
int
vprintf(const char *fmt, va_list ap)
{
- register int savintr;
+ int savintr;
struct putchar_arg pca;
int retval;
@@ -292,9 +312,10 @@ vprintf(const char *fmt, va_list ap)
consintr = 0;
pca.tty = NULL;
pca.flags = TOCONS | TOLOG;
+ pca.pri = -1;
retval = kvprintf(fmt, putchar, &pca, 10, ap);
if (!panicstr)
- logwakeup();
+ msgbuftrigger = 1;
consintr = savintr; /* reenable interrupts */
return retval;
}
@@ -320,7 +341,7 @@ putchar(int c, void *arg)
(flags & TOCONS) && tp == constty)
constty = NULL;
if ((flags & TOLOG))
- msglogchar(c, NULL);
+ msglogchar(c, ap->pri);
if ((flags & TOCONS) && constty == NULL && c != '\0')
(*v_putc)(c);
}
@@ -406,10 +427,10 @@ snprintf_func(int ch, void *arg)
static char *
ksprintn(nbuf, ul, base, lenp)
char *nbuf;
- register u_long ul;
- register int base, *lenp;
+ u_long ul;
+ int base, *lenp;
{
- register char *p;
+ char *p;
p = nbuf;
*p = '\0';
@@ -424,10 +445,10 @@ ksprintn(nbuf, ul, base, lenp)
static char *
ksprintqn(nbuf, uq, base, lenp)
char *nbuf;
- register u_quad_t uq;
- register int base, *lenp;
+ u_quad_t uq;
+ int base, *lenp;
{
- register char *p;
+ char *p;
p = nbuf;
*p = '\0';
@@ -664,6 +685,7 @@ reswitch: switch (ch = (u_char)*fmt++) {
base = 10;
goto nosign;
case 'x':
+ case 'X':
if (qflag)
uq = va_arg(ap, u_quad_t);
else if (lflag)
@@ -740,23 +762,58 @@ number:
}
/*
- * Put character in log buffer.
+ * Put character in log buffer with a particular priority.
*/
static void
-msglogchar(int c, void *dummyarg)
+msglogchar(int c, int pri)
{
- struct msgbuf *mbp;
+ static int lastpri = -1;
+ static int dangling;
+ char nbuf[MAXNBUF];
+ char *p;
- if (c != '\0' && c != '\r' && c != 0177 && msgbufmapped) {
- mbp = msgbufp;
- mbp->msg_ptr[mbp->msg_bufx++] = c;
- if (mbp->msg_bufx >= mbp->msg_size)
- mbp->msg_bufx = 0;
- /* If the buffer is full, keep the most recent data. */
- if (mbp->msg_bufr == mbp->msg_bufx) {
- if (++mbp->msg_bufr >= mbp->msg_size)
- mbp->msg_bufr = 0;
+ if (!msgbufmapped)
+ return;
+ if (c == '\0' || c == '\r')
+ return;
+ if (pri != -1 && pri != lastpri) {
+ if (dangling) {
+ msgaddchar('\n', NULL);
+ dangling = 0;
}
+ msgaddchar('<', NULL);
+ for (p = ksprintn(nbuf, (u_long)pri, 10, NULL); *p;)
+ msgaddchar(*p--, NULL);
+ msgaddchar('>', NULL);
+ lastpri = pri;
+ }
+ msgaddchar(c, NULL);
+ if (c == '\n') {
+ dangling = 0;
+ lastpri = -1;
+ } else {
+ dangling = 1;
+ }
+}
+
+/*
+ * Put char in log buffer
+ */
+static void
+msgaddchar(int c, void *dummy)
+{
+ struct msgbuf *mbp;
+
+ if (!msgbufmapped)
+ return;
+ mbp = msgbufp;
+ mbp->msg_ptr[mbp->msg_bufx++] = c;
+ if (mbp->msg_bufx >= mbp->msg_size)
+ mbp->msg_bufx = 0;
+ /* If the buffer is full, keep the most recent data. */
+ if (mbp->msg_bufr == mbp->msg_bufx) {
+ if (++mbp->msg_bufr >= mbp->msg_size)
+ mbp->msg_bufr = 0;
}
}
@@ -767,7 +824,7 @@ msgbufcopy(struct msgbuf *oldp)
pos = oldp->msg_bufr;
while (pos != oldp->msg_bufx) {
- msglogchar(oldp->msg_ptr[pos], NULL);
+ msglogchar(oldp->msg_ptr[pos], -1);
if (++pos >= oldp->msg_size)
pos = 0;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-09 21:37:37 +0000