From owner-p4-projects@FreeBSD.ORG  Sun Aug 16 13:18:39 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 368401065691; Sun, 16 Aug 2009 13:18:39 +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 ED5DD106568B
	for <perforce@freebsd.org>; Sun, 16 Aug 2009 13:18:38 +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 DC31E8FC4B
	for <perforce@freebsd.org>; Sun, 16 Aug 2009 13:18:38 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7GDIcon066047
	for <perforce@freebsd.org>; Sun, 16 Aug 2009 13:18:38 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7GDIcqo066045
	for perforce@freebsd.org; Sun, 16 Aug 2009 13:18:38 GMT
	(envelope-from trasz@freebsd.org)
Date: Sun, 16 Aug 2009 13:18:38 GMT
Message-Id: <200908161318.n7GDIcqo066045@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 167402 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: Sun, 16 Aug 2009 13:18:39 -0000

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

Change 167402 by trasz@trasz_anger on 2009/08/16 13:18:36

	Enable some KASSERTs.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#59 edit

Differences ...

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

@@ -120,14 +120,6 @@
 
 MALLOC_DEFINE(M_HRL, "hrl", "Hierarchical Resource Limits");
 
-#if 0
-#undef KASSERT
-#define	KASSERT(exp,msg) do {                                           \
-        if (__predict_false(!(exp)))                                    \
-                printf msg;                                             \
-} while (0)
-#endif
-
 #ifdef INVARIANTS
 /*
  * Go through the resource usage info and verify that it makes sense.
@@ -647,17 +639,13 @@
 
 	mtx_lock(&hrl_lock);
 	for (i = 0; i < HRL_RESOURCE_MAX; i++) {
-#ifdef notyet
 		KASSERT(dest->hu_resources[i] >= 0,
 		    ("resource usage propagation meltdown"));
 		KASSERT(src->hu_resources[i] >= 0,
 		    ("resource usage propagation meltdown"));
-#endif
 		dest->hu_resources[i] += src->hu_resources[i];
-#ifdef notyet
 		KASSERT(dest->hu_resources[i] >= 0,
 		    ("resource usage propagation meltdown"));
-#endif
 	}
 	mtx_unlock(&hrl_lock);
 }
@@ -669,19 +657,15 @@
 
 	mtx_lock(&hrl_lock);
 	for (i = 0; i < HRL_RESOURCE_MAX; i++) {
-#ifdef notyet
 		KASSERT(dest->hu_resources[i] >= 0,
 		    ("resource usage propagation meltdown"));
 		KASSERT(src->hu_resources[i] >= 0,
 		    ("resource usage propagation meltdown"));
 		KASSERT(src->hu_resources[i] <= dest->hu_resources[i],
 		    ("resource usage propagation meltdown"));
-#endif
 		dest->hu_resources[i] -= src->hu_resources[i];
-#ifdef notyet
 		KASSERT(dest->hu_resources[i] >= 0,
 		    ("resource usage propagation meltdown"));
-#endif
 	}
 	mtx_unlock(&hrl_lock);
 }