From owner-p4-projects@FreeBSD.ORG Sun Oct 26 14:10:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E80551065673; Sun, 26 Oct 2008 14:10:26 +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 ABD43106567B for ; Sun, 26 Oct 2008 14:10:26 +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 9BA148FC0A for ; Sun, 26 Oct 2008 14:10:26 +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 m9QEAQhd068199 for ; Sun, 26 Oct 2008 14:10:26 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9QEAQYM068197 for perforce@freebsd.org; Sun, 26 Oct 2008 14:10:26 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 26 Oct 2008 14:10:26 GMT Message-Id: <200810261410.m9QEAQYM068197@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 151954 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 14:10:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=151954 Change 151954 by ed@ed_mekker on 2008/10/26 14:09:48 Give /dev/console its own cdevsw, instead of putting all the conditional checks inside the regular TTY routines. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty.c#58 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty.c#58 (text+ko) ==== @@ -224,10 +224,6 @@ return (EPERM); } - /* /dev/console without associated TTY. */ - if (tp == NULL) - return (ENXIO); - tty_lock(tp); if (tty_gone(tp)) { /* Device is already gone. */ @@ -311,9 +307,6 @@ { struct tty *tp = dev->si_drv1; - if (TTY_CONSOLE(dev)) - return (0); - tty_lock(tp); /* @@ -423,9 +416,6 @@ struct tty *tp = dev->si_drv1; int error; - if (TTY_CONSOLE(dev)) - log_console(uio); - error = ttydev_enter(tp); if (error) return (error); @@ -1771,11 +1761,50 @@ * /dev/console handling. */ +static int +ttyconsdev_open(struct cdev *dev, int oflags, int devtype, struct thread *td) +{ + struct tty *tp = dev->si_drv1; + + /* /dev/console without associated TTY. */ + if (tp == NULL) + return (ENXIO); + + return (ttydev_open(dev, oflags, devtype, td)); +} + +static int +ttyconsdev_write(struct cdev *dev, struct uio *uio, int ioflag) +{ + + log_console(uio); + + return (ttydev_write(dev, uio, ioflag)); +} + +/* + * /dev/console is a little different than normal TTY's. Unlike regular + * TTY device nodes, this device node will not revoke the entire TTY + * upon closure and all data written to it will be logged. + */ +static struct cdevsw ttyconsdev_cdevsw = { + .d_version = D_VERSION, + .d_open = ttyconsdev_open, + .d_read = ttydev_read, + .d_write = ttyconsdev_write, + .d_ioctl = ttydev_ioctl, + .d_kqfilter = ttydev_kqfilter, + .d_poll = ttydev_poll, + .d_mmap = ttydev_mmap, + .d_name = "ttyconsdev", + .d_flags = D_TTY, +}; + static void ttyconsdev_init(void *unused) { - dev_console = make_dev(&ttydev_cdevsw, 0, UID_ROOT, GID_WHEEL, + dev_console = make_dev(&ttyconsdev_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "console"); }