d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit a fix for some panics we've been seeing with preemption.

Browse Source 
MFC after:	2 days
This commit is contained in:
Julian Elischer 2004-09-13 23:06:39 +00:00
parent b2578c6c06
commit 1f9f5df61d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/kern_switch.c
View File

@ -224,7 +224,6 @@ slot_fill(struct ksegrp *kg)
}
}
#ifdef SCHED_4BSD
/*
* Remove a thread from its KSEGRP's run queue.
* This in turn may remove it from a KSE if it was already assigned
@ -274,7 +273,6 @@ remrunqueue(struct thread *td)
/* slot_fill(kg); */ /* will replace it with another */
}
}
#endif
/*
* Change the priority of a thread that is on the run queue.
@ -528,8 +526,18 @@ maybe_preempt(struct thread *td)
/*
* Our thread state says that we are already on a run queue, so
* update our state as if we had been dequeued by choosethread().
* However we must not actually be on the system run queue yet.
*/
MPASS(TD_ON_RUNQ(td));
MPASS(td->td_sched->ke_state != KES_ONRUNQ);
if (td->td_proc->p_flag & P_HADTHREADS) {
/*
* If this is a threaded process we actually ARE on the
* ksegrp run queue so take it off that first.
*/
remrunqueue(td); /* maybe use a simpler version */
}
TD_SET_RUNNING(td);
CTR3(KTR_PROC, "preempting to thread %p (pid %d, %s)\n", td,
td->td_proc->p_pid, td->td_proc->p_comm);