From owner-p4-projects@FreeBSD.ORG  Fri Jan 21 18:50:09 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 747AD1065675; Fri, 21 Jan 2011 18:50:09 +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 371841065672
	for <perforce@freebsd.org>; Fri, 21 Jan 2011 18:50:09 +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 245B68FC13
	for <perforce@freebsd.org>; Fri, 21 Jan 2011 18:50:09 +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 p0LIo9MU010546
	for <perforce@freebsd.org>; Fri, 21 Jan 2011 18:50:09 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0LIo9iD010543
	for perforce@freebsd.org; Fri, 21 Jan 2011 18:50:09 GMT
	(envelope-from trasz@freebsd.org)
Date: Fri, 21 Jan 2011 18:50:09 GMT
Message-Id: <201101211850.p0LIo9iD010543@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 188039 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: Fri, 21 Jan 2011 18:50:09 -0000

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

Change 188039 by trasz@trasz_victim on 2011/01/21 18:49:42

	We need proc lock to use FOREACH_THREAD_IN_PROC().

Affected files ...

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

Differences ...

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

@@ -712,6 +712,8 @@
 	u_char newpri;
 	int type;
 
+	PROC_LOCK_ASSERT(p, MA_OWNED);
+
 	if (throttle) {
 		p->p_flag |= P_THROTTLED;
 		newpri = PRI_MIN_IDLE;
@@ -781,6 +783,7 @@
 		FOREACH_PROC_IN_SYSTEM(p) {
 			pctcpu_limit = rusage_get_limit(p, RUSAGE_PCTCPU);
 			pctcpu = 0;
+			PROC_LOCK(p);
 			PROC_SLOCK(p);
 			FOREACH_THREAD_IN_PROC(p, td) {
 				ruxagg(p, td);
@@ -788,15 +791,14 @@
 				pctcpu += sched_pctcpu(td);
 				thread_unlock(td);
 			}
+			PROC_SUNLOCK(p);
 			pctcpu = ((pctcpu * 10000 + FSCALE / 2) >> FSHIFT) / 100;
 			if (pctcpu > pctcpu_limit)
 				rusage_throttle(p, 1);
 			else
 				rusage_throttle(p, 0);
-			PROC_SUNLOCK(p);
 			microuptime(&wallclock);
 			timevalsub(&wallclock, &p->p_stats->p_start);
-			PROC_LOCK(p);
 			rusage_set(p, RUSAGE_WALLCLOCK, wallclock.tv_sec * 1000000 + wallclock.tv_usec);
 			rusage_set(p, RUSAGE_PCTCPU, pctcpu);
 			rusage_set(p, RUSAGE_CPU, cputick2usec(p->p_rux.rux_runtime));