From owner-p4-projects@FreeBSD.ORG  Sat Jul 24 14:43:18 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C396C1065675; Sat, 24 Jul 2010 14:43:18 +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 7BEE4106566C
	for <perforce@freebsd.org>; Sat, 24 Jul 2010 14:43:18 +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 69E2B8FC18
	for <perforce@freebsd.org>; Sat, 24 Jul 2010 14:43:18 +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 o6OEhI9n088076
	for <perforce@freebsd.org>; Sat, 24 Jul 2010 14:43:18 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o6OEhI3f088073
	for perforce@freebsd.org; Sat, 24 Jul 2010 14:43:18 GMT
	(envelope-from trasz@freebsd.org)
Date: Sat, 24 Jul 2010 14:43:18 GMT
Message-Id: <201007241443.o6OEhI3f088073@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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 181430 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: Sat, 24 Jul 2010 14:43:19 -0000

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

Change 181430 by trasz@trasz_victim on 2010/07/24 14:43:16

	Fix CPU time accounting.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#19 edit

Differences ...

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

@@ -73,6 +73,7 @@
 {
 
 	switch (resource) {
+	case RUSAGE_CPU:
 	case RUSAGE_NPROC:
 		return (0);
 	default:
@@ -382,6 +383,9 @@
 	KASSERT(amount >= 0, ("rusage_set: invalid amount for resource %d: %ju",
 	    resource, amount));
 	diff = amount - p->p_container.c_resources[resource];
+	KASSERT(diff >= 0 || container_resource_reclaimable(resource),
+	    ("rusage_set: usage of non-reclaimable resource %d dropping",
+	     resource));
 #ifdef HRL
 	if (diff > 0) {
 		error = hrl_enforce_proc(p, resource, diff);