From owner-p4-projects@FreeBSD.ORG  Fri Oct  5 12:59:11 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 039CD16A421; Fri,  5 Oct 2007 12:59:11 +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 AA81716A41A
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 12:59:10 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8DF9013C480
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 12:59:10 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l95CxAJA006375
	for <perforce@FreeBSD.org>; Fri, 5 Oct 2007 12:59:10 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l95CxAAh006372
	for perforce@freebsd.org; Fri, 5 Oct 2007 12:59:10 GMT
	(envelope-from zec@FreeBSD.org)
Date: Fri, 5 Oct 2007 12:59:10 GMT
Message-Id: <200710051259.l95CxAAh006372@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127226 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: Fri, 05 Oct 2007 12:59:11 -0000

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

Change 127226 by zec@zec_tpx32 on 2007/10/05 12:58:54

	When a process is exiting there is a short window while the
	proc is still schedulable but it doesn't have an ucred
	associated with it any more.  Hence, inside the scheduler
	if p->p_ucred is not available, we supply a dummy loadavg
	value for purposes of priority recalculation, given that the 
	process should be gone anyhow in a few microseconds, so
	inaccurate priority calculation shouldn't be a problem in
	this case.
	
	In short, with this change maintaining per-vprocg load
	average accounting should finally work OK, at least with
	SCHED_4BSD.

Affected files ...

.. //depot/projects/vimage/src/sys/kern/sched_4bsd.c#12 edit

Differences ...

==== //depot/projects/vimage/src/sys/kern/sched_4bsd.c#12 (text+ko) ====

@@ -389,24 +389,25 @@
 static void
 schedcpu(void)
 {
-#ifndef VIMAGE
-	register fixpt_t loadfac = loadfactor(averunnable.ldavg[0]);
-#endif
+	register fixpt_t loadfac;
 	struct thread *td;
 	struct proc *p;
 	struct td_sched *ts;
 	int awake, realstathz;
 
+#ifndef VIMAGE
+	loadfac = loadfactor(averunnable.ldavg[0]);
+#endif
 	realstathz = stathz ? stathz : hz;
 	sx_slock(&allproc_lock);
 	FOREACH_PROC_IN_SYSTEM(p) {
 		PROC_SLOCK(p);
 #ifdef VIMAGE
-		KASSERT((p->p_ucred != NULL), ("p_ucred"));
-		KASSERT((p->p_ucred->cr_vimage != NULL), ("cr_vimage"));
-		KASSERT((p->p_ucred->cr_vimage->v_procg != NULL), ("v_procg"));
-		INIT_VPROCG(p->p_ucred->cr_vimage->v_procg);
-		fixpt_t loadfac = loadfactor(V_averunnable.ldavg[0]);
+		if (p->p_ucred != NULL) {
+			INIT_VPROCG(p->p_ucred->cr_vimage->v_procg);
+			loadfac = loadfactor(V_averunnable.ldavg[0]);
+		} else
+			loadfac = 0;
 #endif
 		FOREACH_THREAD_IN_PROC(p, td) { 
 			awake = 0;