Date: Sat, 24 Jul 2010 14:43:18 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 181430 for review Message-ID: <201007241443.o6OEhI3f088073@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201007241443.o6OEhI3f088073>