| kern_switch.c (67365) | kern_switch.c (70861) |
|---|---|
| 1/* 2 * Copyright (c) 1999 Peter Wemm <peter@FreeBSD.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 9 unchanged lines hidden (view full) --- 18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 * | 1/* 2 * Copyright (c) 1999 Peter Wemm <peter@FreeBSD.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 9 unchanged lines hidden (view full) --- 18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 * |
| 26 * $FreeBSD: head/sys/kern/kern_switch.c 67365 2000-10-20 07:58:15Z jhb $ | 26 * $FreeBSD: head/sys/kern/kern_switch.c 70861 2001-01-10 04:43:51Z jake $ |
| 27 */ 28 29#include <sys/param.h> 30#include <sys/systm.h> 31#include <sys/kernel.h> 32#include <sys/ktr.h> 33#include <sys/mutex.h> 34#include <sys/proc.h> --- 192 unchanged lines hidden (view full) --- 227 which = &queuebits; 228 } else if (idqueuebits) { 229 pri = ffs(idqueuebits) - 1; 230 q = &idqueues[pri]; 231 which = &idqueuebits; 232 } else { 233 CTR1(KTR_PROC, "chooseproc: idleproc, schedlock %lx", 234 (long)sched_lock.mtx_lock); | 27 */ 28 29#include <sys/param.h> 30#include <sys/systm.h> 31#include <sys/kernel.h> 32#include <sys/ktr.h> 33#include <sys/mutex.h> 34#include <sys/proc.h> --- 192 unchanged lines hidden (view full) --- 227 which = &queuebits; 228 } else if (idqueuebits) { 229 pri = ffs(idqueuebits) - 1; 230 q = &idqueues[pri]; 231 which = &idqueuebits; 232 } else { 233 CTR1(KTR_PROC, "chooseproc: idleproc, schedlock %lx", 234 (long)sched_lock.mtx_lock); |
| 235 return idleproc; | 235 return PCPU_GET(idleproc); |
| 236 } 237 p = TAILQ_FIRST(q); 238#ifdef SMP 239 /* wander down the current run queue for this pri level for a match */ | 236 } 237 p = TAILQ_FIRST(q); 238#ifdef SMP 239 /* wander down the current run queue for this pri level for a match */ |
| 240 id = cpuid; | 240 id = PCPU_GET(cpuid); |
| 241 while (p->p_lastcpu != id) { 242 p = TAILQ_NEXT(p, p_procq); 243 if (p == NULL) { 244 p = TAILQ_FIRST(q); 245 break; 246 } 247 } 248#endif 249 CTR4(KTR_PROC, "chooseproc: proc %p (pid %d, %s), schedlock %lx", 250 p, p->p_pid, p->p_comm, (long)sched_lock.mtx_lock); 251 KASSERT(p, ("chooseproc: no proc on busy queue")); 252 TAILQ_REMOVE(q, p, p_procq); 253 if (TAILQ_EMPTY(q)) 254 *which &= ~(1 << pri); 255 return p; 256} | 241 while (p->p_lastcpu != id) { 242 p = TAILQ_NEXT(p, p_procq); 243 if (p == NULL) { 244 p = TAILQ_FIRST(q); 245 break; 246 } 247 } 248#endif 249 CTR4(KTR_PROC, "chooseproc: proc %p (pid %d, %s), schedlock %lx", 250 p, p->p_pid, p->p_comm, (long)sched_lock.mtx_lock); 251 KASSERT(p, ("chooseproc: no proc on busy queue")); 252 TAILQ_REMOVE(q, p, p_procq); 253 if (TAILQ_EMPTY(q)) 254 *which &= ~(1 << pri); 255 return p; 256} |