From owner-p4-projects@FreeBSD.ORG  Thu Dec 23 21:17:47 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7FE4A106566B; Thu, 23 Dec 2010 21:17: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 429CC1065672
	for <perforce@freebsd.org>; Thu, 23 Dec 2010 21:17:47 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 2FEDD8FC08
	for <perforce@freebsd.org>; Thu, 23 Dec 2010 21:17:47 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id oBNLHlVj033936
	for <perforce@freebsd.org>; Thu, 23 Dec 2010 21:17:47 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id oBNLHlGS033933
	for perforce@freebsd.org; Thu, 23 Dec 2010 21:17:47 GMT
	(envelope-from trasz@freebsd.org)
Date: Thu, 23 Dec 2010 21:17:47 GMT
Message-Id: <201012232117.oBNLHlGS033933@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 187168 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Thu, 23 Dec 2010 21:17:47 -0000

http://p4web.freebsd.org/@@187168?ac=10

Change 187168 by trasz@trasz_victim on 2010/12/23 21:16:55

	Now that we keep a pointer to ucred for terminals, make RUSAGE_NPTS
	sloppy.  This means the per-ucred (per-jail, per-user etc) values are
	now right, although the per-process ones are meaningless.  Life is all
	about choices.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#43 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/tty_pts.c#23 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#43 (text+ko) ====

@@ -104,6 +104,7 @@
 	case RUSAGE_MEMLOCK:
 	case RUSAGE_NPROC:
 	case RUSAGE_SBSIZE:
+	case RUSAGE_NPTS:
 	case RUSAGE_SWAP:
 	case RUSAGE_NTHR:
 	case RUSAGE_NMSGQ:
@@ -140,6 +141,7 @@
 
 	switch (resource) {
 	case RUSAGE_SBSIZE:
+	case RUSAGE_NPTS:
 	case RUSAGE_SWAP:
 	case RUSAGE_NMSGQ:
 	case RUSAGE_MSGQQUEUED:

==== //depot/projects/soc2009/trasz_limits/sys/kern/tty_pts.c#23 (text+ko) ====

@@ -576,8 +576,6 @@
 	tty_lock(tp);
 	tty_rel_gone(tp);
 
-	rusage_sub(td->td_proc, RUSAGE_NPTS, 1);
-
 	/*
 	 * Open of /dev/ptmx or /dev/ptyXX changes the type of file
 	 * from DTYPE_VNODE to DTYPE_PTS. vn_open() increases vnode
@@ -685,6 +683,7 @@
 		free_unr(pts_pool, psc->pts_unit);
 
 	chgptscnt(psc->pts_cred->cr_ruidinfo, -1, 0);
+	rusage_sub_cred(psc->pts_cred, RUSAGE_NPTS, 1);
 	crfree(psc->pts_cred);
 
 	knlist_destroy(&psc->pts_inpoll.si_note);