From owner-p4-projects@FreeBSD.ORG Sat Sep 11 00:26:53 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8894116A4E3; Sat, 11 Sep 2004 00:26:52 +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 44F4E16A4CE for ; Sat, 11 Sep 2004 00:26:52 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19EAE43D39 for ; Sat, 11 Sep 2004 00:26:52 +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 i8B0QpG8074576 for ; Sat, 11 Sep 2004 00:26:51 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8B0Qpka074573 for perforce@freebsd.org; Sat, 11 Sep 2004 00:26:51 GMT (envelope-from julian@freebsd.org) Date: Sat, 11 Sep 2004 00:26:51 GMT Message-Id: <200409110026.i8B0Qpka074573@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61328 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Sep 2004 00:26:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=61328 Change 61328 by julian@julian_ref on 2004/09/11 00:26:45 recycle fixes from -current Affected files ... .. //depot/projects/nsched/sys/i386/i386/pmap.c#20 integrate .. //depot/projects/nsched/sys/kern/sched_4bsd.c#46 integrate .. //depot/projects/nsched/sys/kern/sched_ule.c#29 integrate .. //depot/projects/nsched/sys/sys/proc.h#28 integrate .. //depot/projects/nsched/sys/sys/sched.h#17 integrate Differences ... ==== //depot/projects/nsched/sys/i386/i386/pmap.c#20 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.501 2004/09/08 18:58:29 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.502 2004/09/10 22:28:33 julian Exp $"); /* * Manages physical address maps. ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#46 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.61 2004/09/10 21:04:38 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.62 2004/09/10 22:28:32 julian Exp $"); #define kse td_sched ==== //depot/projects/nsched/sys/kern/sched_ule.c#29 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.126 2004/09/10 21:04:38 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.128 2004/09/11 00:11:09 julian Exp $"); #include @@ -344,10 +344,10 @@ */ #ifdef __i386__ #define KSE_CAN_MIGRATE(ke, class) \ - ((ke)->ke_thread->td_pinned == 0 && ((ke)->ke_flags & KEF_BOUND) == 0) + ((ke)->ke_pinned == 0 && ((ke)->ke_flags & KEF_BOUND) == 0) #else /* !__i386__ */ #define KSE_CAN_MIGRATE(ke, class) \ - ((class) != PRI_ITHD && (ke)->ke_thread->td_pinned == 0 && \ + ((class) != PRI_ITHD && (ke)->ke_pinned == 0 && \ ((ke)->ke_flags & KEF_BOUND) == 0) #endif /* !__i386__ */ #endif @@ -1912,7 +1912,7 @@ void sched_unpin(void) { - curthread->td_sched->td_pinned--; + curthread->td_sched->ke_pinned--; } #ifdef INVARIANTS ==== //depot/projects/nsched/sys/sys/proc.h#28 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/proc.h,v 1.399 2004/09/05 02:09:54 julian Exp $ + * $FreeBSD: src/sys/sys/proc.h,v 1.400 2004/09/10 22:28:33 julian Exp $ */ #ifndef _SYS_PROC_H_ ==== //depot/projects/nsched/sys/sys/sched.h#17 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/sched.h,v 1.17 2004/09/10 21:04:37 julian Exp $ + * $FreeBSD: src/sys/sys/sched.h,v 1.18 2004/09/10 22:28:33 julian Exp $ */ #ifndef _SYS_SCHED_H_ @@ -92,6 +92,13 @@ int sched_ispinned(void); #endif +/* these only work for curthread */ +void sched_pin(void); +void sched_unpin(void); +#ifdef INVARIANTS +int sched_ispinned(void); +#endif + /* * These procedures tell the process data structure allocation code how * many bytes to actually allocate.