From owner-p4-projects@FreeBSD.ORG  Sat Jun 20 17:58:00 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1A3B41065679; Sat, 20 Jun 2009 17:58:00 +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 CBC011065677
	for <perforce@freebsd.org>; Sat, 20 Jun 2009 17:57:59 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B136B8FC2B
	for <perforce@freebsd.org>; Sat, 20 Jun 2009 17:57:59 +0000 (UTC)
	(envelope-from trasz@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 n5KHvxtM046371
	for <perforce@freebsd.org>; Sat, 20 Jun 2009 17:57:59 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5KHvxam046369
	for perforce@freebsd.org; Sat, 20 Jun 2009 17:57:59 GMT
	(envelope-from trasz@freebsd.org)
Date: Sat, 20 Jun 2009 17:57:59 GMT
Message-Id: <200906201757.n5KHvxam046369@repoman.freebsd.org>
X-Authentication-Warning: repoman.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>
Cc: 
Subject: PERFORCE change 164771 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: Sat, 20 Jun 2009 17:58:01 -0000

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

Change 164771 by trasz@trasz_victim on 2009/06/20 17:57:16

	Misc. tweaks for asserts; still commented out.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#13 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#11 edit

Differences ...

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

@@ -116,13 +116,13 @@
 	cred = p->p_ucred;
 
 	for (resource = 0; resource < HRL_RESOURCE_MAX; resource++)
-		KASSERT(p->p_accounting.ha_resources[resource] >= 0, (""));
-	KASSERT(cred->cr_ruidinfo->ui_accounting.ha_resources[resource] >= 0, (""));
+		KASSERT(p->p_accounting.ha_resources[resource] >= 0, ("resource usage propagation meltdown"));
+	KASSERT(cred->cr_ruidinfo->ui_accounting.ha_resources[resource] >= 0, ("resource usage propagation meltdown"));
 	for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent)
-		KASSERT(pr->pr_accounting.ha_resources[resource] >= 0, (""));
+		KASSERT(pr->pr_accounting.ha_resources[resource] >= 0, ("resource usage propagation meltdown"));
 	for (i = 0; i < cred->cr_ngroups; i++) {
 		for (resource = 0; resource < HRL_RESOURCE_MAX; resource++)
-			KASSERT(cred->cr_gidinfos[i]->gi_accounting.ha_resources[resource] >= 0, (""));
+			KASSERT(cred->cr_gidinfos[i]->gi_accounting.ha_resources[resource] >= 0, ("resource usage propagation meltdown"));
 	}
 #endif
 }
@@ -209,6 +209,9 @@
 	KASSERT(amount > 0, ("invalid amount"));
 
 	p->p_accounting.ha_resources[resource] -= amount;
+#ifdef notyet
+	KASSERT(amount >= p->p_accounting.ha_resources[resource], ("freeing more than allocated"));
+#endif
 	cred = p->p_ucred;
 	cred->cr_ruidinfo->ui_accounting.ha_resources[resource] -= amount;
 	cred->cr_uidinfo->ui_accounting.ha_resources[resource] -= amount;
@@ -290,10 +293,13 @@
 	int i;
 
 	for (i = 0; i < HRL_RESOURCE_MAX; i++) {
-			dest->ha_resources[i] += src->ha_resources[i];
+#ifdef notyet
+		KASSERT(dest->ha_resources[i] >= 0, ("resource usage propagation meltdown"));
+#endif
+		dest->ha_resources[i] += src->ha_resources[i];
 #ifdef notyet
-			KASSERT(src->ha_resources[i] >= 0, (""));
-			KASSERT(dest->ha_resources[i] >= 0, (""));
+		KASSERT(src->ha_resources[i] >= 0, ("resource usage propagation meltdown"));
+		KASSERT(dest->ha_resources[i] >= 0, ("resource usage propagation meltdown"));
 #endif
 	}
 }
@@ -304,10 +310,13 @@
 	int i;
 
 	for (i = 0; i < HRL_RESOURCE_MAX; i++) {
-			dest->ha_resources[i] -= src->ha_resources[i];
+#ifdef notyet
+		KASSERT(dest->ha_resources[i] >= 0, ("resource usage propagation meltdown"));
+#endif
+		dest->ha_resources[i] -= src->ha_resources[i];
 #ifdef notyet
-			KASSERT(src->ha_resources[i] >= 0, (""));
-			KASSERT(dest->ha_resources[i] >= 0, (""));
+		KASSERT(src->ha_resources[i] >= 0, ("resource usage propagation meltdown"));
+		KASSERT(dest->ha_resources[i] >= 0, ("resource usage propagation meltdown"));
 #endif
 	}
 }

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