Move suspension checking code from userret() into thread_userret().

This commit is contained in:
David Xu 2002-10-26 02:56:51 +00:00
parent 8dbf84eec4
commit 3139ada54c
3 changed files with 26 additions and 13 deletions

View File

@ -1240,6 +1240,18 @@ thread_userret(struct thread *td, struct trapframe *frame)
kg = td->td_ksegrp;
p = td->td_proc;
/*
* We need to check to see if we have to exit or wait due to a
* single threading requirement or some other STOP condition.
* Don't bother doing all the work if the stop bits are not set
* at this time.. If we miss it, we miss it.. no big deal.
*/
if (P_SHOULDSTOP(p)) {
PROC_LOCK(p);
thread_suspend_check(0); /* Can suspend or kill */
PROC_UNLOCK(p);
}
/*
* Originally bound threads never upcall but they may
* loan out their KSE at this point.

View File

@ -1240,6 +1240,18 @@ thread_userret(struct thread *td, struct trapframe *frame)
kg = td->td_ksegrp;
p = td->td_proc;
/*
* We need to check to see if we have to exit or wait due to a
* single threading requirement or some other STOP condition.
* Don't bother doing all the work if the stop bits are not set
* at this time.. If we miss it, we miss it.. no big deal.
*/
if (P_SHOULDSTOP(p)) {
PROC_LOCK(p);
thread_suspend_check(0); /* Can suspend or kill */
PROC_UNLOCK(p);
}
/*
* Originally bound threads never upcall but they may
* loan out their KSE at this point.

View File

@ -100,19 +100,8 @@ userret(td, frame, oticks)
sched_userret(td);
/*
* We need to check to see if we have to exit or wait due to a
* single threading requirement or some other STOP condition.
* Don't bother doing all the work if the stop bits are not set
* at this time.. If we miss it, we miss it.. no big deal.
*/
if (P_SHOULDSTOP(p)) {
PROC_LOCK(p);
thread_suspend_check(0); /* Can suspend or kill */
PROC_UNLOCK(p);
}
/*
* Do special thread processing, e.g. upcall tweaking and such.
* Do special thread processing, e.g. suspension checking, upcall
* tweaking and such.
*/
if (p->p_flag & P_KSES) {
thread_userret(td, frame);