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

Fix maybe_preempt_in_ksegrp for !SMP.

Browse Source 
Tested   by: tegge
Reviewed by: julian
Approved by: sam (mentor)
MFC after: 3 days
This commit is contained in:
Stephan Uphoff 2004-10-13 22:07:04 +00:00
parent d46316e8f9
commit 7c71b6453a
1 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sys/kern/kern_switch.c
View File

@ -328,9 +328,39 @@ adjustrunqueue( struct thread *td, int newpri)
static void
maybe_preempt_in_ksegrp(struct thread *td)
#if !defined(SMP)
{
struct thread *running_thread;
#ifndef FULL_PREEMPTION
int pri;
pri = td->td_priority;
if (!(pri >= PRI_MIN_ITHD && pri <= PRI_MAX_ITHD))
return;
#endif
mtx_assert(&sched_lock, MA_OWNED);
running_thread = curthread;
if (running_thread->td_ksegrp != td->td_ksegrp)
return;
if (td->td_priority > running_thread->td_priority)
return;
#ifdef PREEMPTION
if (running_thread->td_critnest > 1)
running_thread->td_pflags |= TDP_OWEPREEMPT;
else
mi_switch(SW_INVOL, NULL);
#else
running_thread->td_flags |= TDF_NEEDRESCHED;
#endif
return;
}
#else /* SMP */
{
struct thread *running_thread;
#if defined(SMP)
int worst_pri;
struct ksegrp *kg;
cpumask_t cpumask,dontuse;
@ -403,12 +433,6 @@ maybe_preempt_in_ksegrp(struct thread *td)
}
#endif
#else
running_thread = curthread;
KASSERT(running_thread->td_ksegrp == td->td_ksegrp,
("maybe_preempt_in_ksegrp: No chance to run thread"));
#endif
if (td->td_priority > running_thread->td_priority)
return;
#ifdef PREEMPTION
@ -422,6 +446,8 @@ maybe_preempt_in_ksegrp(struct thread *td)
#endif
return;
}
#endif /* !SMP */
int limitcount;
void