From owner-p4-projects@FreeBSD.ORG Sun Oct 26 13:30:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F51F1065671; Sun, 26 Oct 2008 13:30:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 02FCA1065676 for ; Sun, 26 Oct 2008 13:30:36 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E6D778FC14 for ; Sun, 26 Oct 2008 13:30:35 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QDUZ6l064020 for ; Sun, 26 Oct 2008 13:30:35 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9QDUZCD064018 for perforce@freebsd.org; Sun, 26 Oct 2008 13:30:35 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 26 Oct 2008 13:30:35 GMT Message-Id: <200810261330.m9QDUZCD064018@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 151948 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Oct 2008 13:30:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=151948 Change 151948 by ed@ed_dull on 2008/10/26 13:30:10 Commit my work in progress /dev/console-replacement. Affected files ... .. //depot/projects/mpsafetty/sys/kern/subr_prf.c#3 edit .. //depot/projects/mpsafetty/sys/kern/tty.c#55 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/subr_prf.c#3 (text+ko) ==== @@ -259,15 +259,17 @@ { int c, i, error, nl; char *consbuffer; - int pri; + int pri = LOG_INFO | LOG_CONSOLE; + if (!log_console_output) return; - pri = LOG_INFO | LOG_CONSOLE; uio = cloneuio(uio); consbuffer = malloc(CONSCHUNK, M_TEMP, M_WAITOK); + mtx_lock(&Giant); + nl = 0; while (uio->uio_resid > 0) { c = imin(uio->uio_resid, CONSCHUNK); @@ -285,9 +287,11 @@ if (!nl) msglogchar('\n', pri); msgbuftrigger = 1; + + mtx_unlock(&Giant); + free(uio, M_IOV); free(consbuffer, M_TEMP); - return; } int ==== //depot/projects/mpsafetty/sys/kern/tty.c#55 (text+ko) ==== @@ -73,6 +73,9 @@ SX_SYSINIT(tty_list, &tty_list_sx, "tty list"); static unsigned int tty_list_count = 0; +/* Character device of /dev/console. */ +static struct cdev dev_console; + /* * Flags that are supported and stored by this implementation. */ @@ -86,7 +89,8 @@ HUPCL|CLOCAL|CCTS_OFLOW|CRTS_IFLOW|CDTR_IFLOW|\ CDSR_OFLOW|CCAR_OFLOW) -#define TTY_CALLOUT(tp,d) ((tp)->t_dev != (d)) +#define TTY_CONSOLE(d) ((d) == dev_console) +#define TTY_CALLOUT(tp,d) ((d) != (tp)->t_dev && !TTY_CONSOLE(d)) /* * Set TTY buffer sizes. @@ -220,6 +224,10 @@ return (EPERM); } + /* /dev/console without associated TTY. */ + if (tp == NULL) + return (ENXIO); + tty_lock(tp); if (tty_gone(tp)) { /* Device is already gone. */ @@ -412,6 +420,9 @@ struct tty *tp = dev->si_drv1; int error; + if (TTY_CONSOLE(dev)) + log_console(uio); + error = ttydev_enter(tp); if (error) return (error); @@ -1122,6 +1133,10 @@ dev->si_drv2 = &tp->t_termios_lock_out; } } + + /* XXX: console hardcoding! */ + if (strcmp(tty_devname(tp), "ttyv0") == 0) + dev_console->si_drv1 = tp; } /* @@ -1662,6 +1677,10 @@ ttydevsw_inwakeup(tp); } +/* + * TTY hooks interface. + */ + static int ttyhook_defrint(struct tty *tp, char c, int flags) { @@ -1745,6 +1764,20 @@ tty_rel_free(tp); } +/* + * /dev/console handling. + */ + +static void +ttyconsdev_init(void *unused) +{ + + dev_console = make_dev(&ttydev_cdevsw, 0, UID_ROOT, GID_WHEEL, + 0600, "konzole"); +} + +SYSINIT(tty, SI_SUB_DRIVERS, SI_ORDER_FIRST, ttyconsdev_init, NULL); + #include "opt_ddb.h" #ifdef DDB #include