From owner-dev-commits-src-all@freebsd.org Sat Sep 4 03:19:03 2021
Return-Path: <owner-dev-commits-src-all@freebsd.org>
Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9AD466AAB34;
Sat, 4 Sep 2021 03:19:03 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4H1fyb3llsz3jyg;
Sat, 4 Sep 2021 03:19:03 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 622FD1093B;
Sat, 4 Sep 2021 03:19:03 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1843J3KL002543;
Sat, 4 Sep 2021 03:19:03 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1843J37M002542;
Sat, 4 Sep 2021 03:19:03 GMT (envelope-from git)
Date: Sat, 4 Sep 2021 03:19:03 GMT
Message-Id: <202109040319.1843J37M002542@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Alexander Motin <mav@FreeBSD.org>
Subject: git: a264594d4ff1 - main - Unify console output.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mav
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: a264594d4ff19fd13f7c39a56c8d131296db480d
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for all branches of the src repository
<dev-commits-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-all>,
<mailto:dev-commits-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-all/>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Help: <mailto:dev-commits-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all>,
<mailto:dev-commits-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Sep 2021 03:19:03 -0000
The branch main has been updated by mav:
URL: https://cgit.FreeBSD.org/src/commit/?id=a264594d4ff19fd13f7c39a56c8d131296db480d
commit a264594d4ff19fd13f7c39a56c8d131296db480d
Author: Alexander Motin <mav@FreeBSD.org>
AuthorDate: 2021-09-04 03:13:42 +0000
Commit: Alexander Motin <mav@FreeBSD.org>
CommitDate: 2021-09-04 03:13:42 +0000
Unify console output.
Without this change when virtual console enabled depending on buffer
presence and state different parts of output go to different consoles.
MFC after: 1 month
---
sys/kern/subr_prf.c | 35 +++++++++++++++++++++--------------
1 file changed, 21 insertions(+), 14 deletions(-)
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index bbe95653919f..1106587ebbe7 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -118,6 +118,7 @@ extern int log_open;
static void msglogchar(int c, int pri);
static void msglogstr(char *str, int pri, int filter_cr);
+static void prf_putbuf(char *bufr, int flags, int pri);
static void putchar(int ch, void *arg);
static char *ksprintn(char *nbuf, uintmax_t num, int base, int *len, int upper);
static void snprintf_func(int ch, void *arg);
@@ -296,13 +297,8 @@ _vprintf(int level, int flags, const char *fmt, va_list ap)
#ifdef PRINTF_BUFR_SIZE
/* Write any buffered console/log output: */
- if (*pca.p_bufr != '\0') {
- if (pca.flags & TOLOG)
- msglogstr(pca.p_bufr, level, /*filter_cr*/1);
-
- if (pca.flags & TOCONS)
- cnputs(pca.p_bufr);
- }
+ if (*pca.p_bufr != '\0')
+ prf_putbuf(pca.p_bufr, flags, level);
#endif
TSEXIT();
@@ -423,6 +419,22 @@ vprintf(const char *fmt, va_list ap)
return (retval);
}
+static void
+prf_putchar(int c, int flags, int pri)
+{
+
+ if (flags & TOLOG)
+ msglogchar(c, pri);
+
+ if (flags & TOCONS) {
+ if ((!KERNEL_PANICKED()) && (constty != NULL))
+ msgbuf_addchar(&consmsgbuf, c);
+
+ if ((constty == NULL) || always_console_output)
+ cnputc(c);
+ }
+}
+
static void
prf_putbuf(char *bufr, int flags, int pri)
{
@@ -435,7 +447,7 @@ prf_putbuf(char *bufr, int flags, int pri)
msgbuf_addstr(&consmsgbuf, -1,
bufr, /*filter_cr*/ 0);
- if ((constty == NULL) ||(always_console_output))
+ if ((constty == NULL) || always_console_output)
cnputs(bufr);
}
}
@@ -445,12 +457,7 @@ putbuf(int c, struct putchar_arg *ap)
{
/* Check if no console output buffer was provided. */
if (ap->p_bufr == NULL) {
- /* Output direct to the console. */
- if (ap->flags & TOCONS)
- cnputc(c);
-
- if (ap->flags & TOLOG)
- msglogchar(c, ap->pri);
+ prf_putchar(c, ap->flags, ap->pri);
} else {
/* Buffer the character: */
*ap->p_next++ = c;