From owner-p4-projects@FreeBSD.ORG  Tue Jul  6 07:59:12 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7A54016A4CF; Tue,  6 Jul 2004 07:59:12 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3D6AB16A4D0
	for <perforce@freebsd.org>; Tue,  6 Jul 2004 07:59:12 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 352BD43D31
	for <perforce@freebsd.org>; Tue,  6 Jul 2004 07:59:12 +0000 (GMT)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i667xCdH011841
	for <perforce@freebsd.org>; Tue, 6 Jul 2004 07:59:12 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i667xBnw011838
	for perforce@freebsd.org; Tue, 6 Jul 2004 07:59:11 GMT
	(envelope-from julian@freebsd.org)
Date: Tue, 6 Jul 2004 07:59:11 GMT
Message-Id: <200407060759.i667xBnw011838@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 56601 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Tue, 06 Jul 2004 07:59:13 -0000

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

Change 56601 by julian@julian_jules1 on 2004/07/06 07:58:17

	 try catch up with jhb

Affected files ...

.. //depot/projects/nsched/sys/kern/sched_4bsd.c#25 edit
.. //depot/projects/nsched/sys/kern/sched_ule.c#13 edit

Differences ...

==== //depot/projects/nsched/sys/kern/sched_4bsd.c#25 (text+ko) ====

@@ -1007,7 +1007,8 @@
 	KASSERT(td->td_proc->p_sflag & PS_INMEM,
 	    ("sched_add: process swapped out"));
 
-#ifdef SMP
+#if 0
+#ifdef SMP 
 	/*
 	 * Only try to preempt if the thread is unpinned or pinned to the
 	 * current CPU.
@@ -1016,6 +1017,7 @@
 #endif
 	if (maybe_preempt(td))
 		return;
+#endif
 	td->td_ksegrp->kg_runq_threads++;
 	std->std_state = STDS_ONRUNQ;
 
@@ -1889,7 +1891,7 @@
 	pri = td->td_priority;
 	cpri = ctd->td_priority;
 	if (pri >= cpri || cold /* || dumping */ || TD_IS_INHIBITED(ctd) ||
-	    td->td_td_sched->std_state != STDS_THREAD)
+	    td->td_sched->std_state != STDS_THREAD)
 		return (0);
 #ifndef FULL_PREEMPTION
 	if (!(pri >= PRI_MIN_ITHD && pri <= PRI_MAX_ITHD) &&

==== //depot/projects/nsched/sys/kern/sched_ule.c#13 (text+ko) ====