From owner-p4-projects@FreeBSD.ORG  Mon Aug  4 15:02:48 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ADDC51065671; Mon,  4 Aug 2008 15:02: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 71DED106566C
	for <perforce@FreeBSD.org>; Mon,  4 Aug 2008 15:02: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 6567A8FC08
	for <perforce@FreeBSD.org>; Mon,  4 Aug 2008 15:02: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 m74F2lNf064887
	for <perforce@FreeBSD.org>; Mon, 4 Aug 2008 15:02:47 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m74F2lI8064885
	for perforce@freebsd.org; Mon, 4 Aug 2008 15:02:47 GMT
	(envelope-from ed@FreeBSD.org)
Date: Mon, 4 Aug 2008 15:02:47 GMT
Message-Id: <200808041502.m74F2lI8064885@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 146631 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: Mon, 04 Aug 2008 15:02:48 -0000

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

Change 146631 by ed@ed_flippo on 2008/08/04 15:02:26

	Move the buffer deallocation into tty_freebuffers(), which shall
	be called when closing and deallocating the TTY.

Affected files ...

.. //depot/projects/mpsafetty/sys/kern/tty.c#14 edit

Differences ...

==== //depot/projects/mpsafetty/sys/kern/tty.c#14 (text+ko) ====

@@ -112,6 +112,23 @@
 	tp->t_outlow = (ttyoutq_getsize(&tp->t_outq) * 9) / 10;
 }
 
+static void
+tty_freebuffers(struct tty *tp)
+{
+
+	/* Destroy input buffers */
+	ttyinq_flush(&tp->t_inq);
+	ttyinq_setsize(&tp->t_inq, NULL, 0);
+	MPASS(ttyinq_getsize(&tp->t_inq) == 0);
+	tp->t_inlow = 0;
+
+	/* Destroy output buffers */
+	ttyoutq_flush(&tp->t_outq);
+	ttyoutq_setsize(&tp->t_outq, NULL, 0);
+	MPASS(ttyoutq_getsize(&tp->t_outq) == 0);
+	tp->t_outlow = 0;
+}
+
 static int
 tty_drain(struct tty *tp)
 {
@@ -186,10 +203,7 @@
 	ttydisc_close(tp);
 
 	/* Destroy associated buffers already */
-	ttyinq_setsize(&tp->t_inq, NULL, 0);
-	tp->t_inlow = 0;
-	ttyoutq_setsize(&tp->t_outq, NULL, 0);
-	tp->t_outlow = 0;
+	tty_freebuffers(tp);
 
 	knlist_clear(&tp->t_inpoll.si_note, 1);
 	knlist_clear(&tp->t_outpoll.si_note, 1);
@@ -923,9 +937,7 @@
 		return;
 	}
 
-	/* Make sure we don't leak buffers */
-	MPASS(ttyinq_getsize(&tp->t_inq) == 0);
-	MPASS(ttyoutq_getsize(&tp->t_outq) == 0);
+	tty_freebuffers(tp);
 
 	/* TTY can be deallocated */
 	dev = tp->t_dev;
@@ -961,6 +973,7 @@
 void
 tty_rel_gone(struct tty *tp)
 {
+	MPASS((tp->t_flags & TF_GONE) == 0);
 
 	/* Simulate carrier removal */
 	ttydisc_modem(tp, 0);