From owner-p4-projects@FreeBSD.ORG  Fri Aug 29 12:14:47 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 86F1A1065679; Fri, 29 Aug 2008 12:14:47 +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 4B0D3106564A
	for <perforce@FreeBSD.org>; Fri, 29 Aug 2008 12:14:47 +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 37ED18FC0C
	for <perforce@FreeBSD.org>; Fri, 29 Aug 2008 12:14:47 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7TCEk4k011050
	for <perforce@FreeBSD.org>; Fri, 29 Aug 2008 12:14:46 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7TCEkdM011048
	for perforce@freebsd.org; Fri, 29 Aug 2008 12:14:46 GMT
	(envelope-from ed@FreeBSD.org)
Date: Fri, 29 Aug 2008 12:14:46 GMT
Message-Id: <200808291214.m7TCEkdM011048@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ed@FreeBSD.org using -f
From: Ed Schouten <ed@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 148791 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Aug 2008 12:14:47 -0000

http://perforce.freebsd.org/chv.cgi?CH=148791

Change 148791 by ed@ed_dull on 2008/08/29 12:14:14

	Add proper inline routine for ttyhook calls, just like ttydevsw.

Affected files ...

.. //depot/projects/mpsafetty/sys/kern/tty_ttydisc.c#17 edit
.. //depot/projects/mpsafetty/sys/sys/ttyhook.h#5 edit

Differences ...

==== //depot/projects/mpsafetty/sys/kern/tty_ttydisc.c#17 (text+ko) ====

@@ -1096,9 +1096,8 @@
 
 	len = ttyoutq_read(&tp->t_outq, buf, len);
 
-	/* Invoke TTY hooks. XXX: ttyhook_getc_capture()? */
 	if (ttyhook_hashook(tp, getc_capture))
-		tp->t_hook->th_getc_capture(tp, buf, len);
+		ttyhook_getc_capture(tp, buf, len);
 
 	ttydisc_wakeup_watermark(tp);
 	atomic_add_long(&tty_nout, len);

==== //depot/projects/mpsafetty/sys/sys/ttyhook.h#5 (text+ko) ====

@@ -52,4 +52,13 @@
 #define	ttyhook_hashook(tp,hook)	((tp)->t_hook != NULL && \
 					(tp)->t_hook->th_ ## hook != NULL)
 
+static __inline void
+ttyhook_getc_capture(struct tty *tp, const void *buf, size_t len)
+{
+	tty_lock_assert(tp, MA_OWNED);
+	MPASS(!tty_gone(tp));
+
+	tp->t_hook->th_getc_capture(tp, buf, len);
+}
+
 #endif /* !_SYS_TTYHOOK_H_ */