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

slight cleanup of single-threading code for KSE processes

Browse Source
This commit is contained in:
julian 2002-08-22 21:45:58 +00:00
parent 7a233d4c9f
commit 169932bd89
4 changed files with 53 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/kern/kern_exec.c
View File

@ -162,11 +162,19 @@ execve(td, uap)
PROC_LOCK(p);
KASSERT((p->p_flag & P_INEXEC) == 0,
("%s(): process already has P_INEXEC flag", __func__));
if ((p->p_flag & P_KSES) && thread_single(SNGLE_EXIT)) {
PROC_UNLOCK(p);
return (ERESTART); /* Try again later. */
if (p->p_flag & P_KSES) {
if (thread_single(SNGLE_EXIT)) {
PROC_UNLOCK(p);
return (ERESTART); /* Try again later. */
}
/*
* If we get here all other threads are dead,
* so unset the associated flags and lose KSE mode.
*/
p->p_flag &= ~P_KSES;
td->td_flags &= ~TDF_UNBOUND;
thread_single_end();
}
/* If we get here all other threads are dead. */
p->p_flag |= P_INEXEC;
PROC_UNLOCK(p);

9
sys/kern/kern_fork.c
View File

@ -767,6 +767,15 @@ fork1(td, flags, procp)
msleep(p1, &p2->p_mtx, PWAIT, "ppwait", 0);
PROC_UNLOCK(p2);
/*
* If other threads are waiting, let them continue now
*/
if (p1->p_flag & P_KSES) {
PROC_LOCK(p1);
thread_single_end();
PROC_UNLOCK(p1);
}
/*
* Return child proc pointer to parent.
*/

17
sys/kern/kern_kse.c
View File

@ -804,6 +804,21 @@ thread_single_end(void)
PROC_LOCK_ASSERT(p, MA_OWNED);
p->p_flag &= ~P_STOPPED_SNGL;
p->p_singlethread = NULL;
thread_unsuspend(p);
/*
* If there are other threads they mey now run,
* unless of course there is a blanket 'stop order'
* on the process. The single threader must be allowed
* to continue however as this is a bad place to stop.
*/
if ((p->p_numthreads != 1) && (!P_SHOULDSTOP(p))) {
mtx_lock_spin(&sched_lock);
while (( td = TAILQ_FIRST(&p->p_suspended))) {
TAILQ_REMOVE(&p->p_suspended, td, td_runq);
p->p_suspcount--;
setrunqueue(td);
}
mtx_unlock_spin(&sched_lock);
}
}

17
sys/kern/kern_thread.c
View File

@ -804,6 +804,21 @@ thread_single_end(void)
PROC_LOCK_ASSERT(p, MA_OWNED);
p->p_flag &= ~P_STOPPED_SNGL;
p->p_singlethread = NULL;
thread_unsuspend(p);
/*
* If there are other threads they mey now run,
* unless of course there is a blanket 'stop order'
* on the process. The single threader must be allowed
* to continue however as this is a bad place to stop.
*/
if ((p->p_numthreads != 1) && (!P_SHOULDSTOP(p))) {
mtx_lock_spin(&sched_lock);
while (( td = TAILQ_FIRST(&p->p_suspended))) {
TAILQ_REMOVE(&p->p_suspended, td, td_runq);
p->p_suspcount--;
setrunqueue(td);
}
mtx_unlock_spin(&sched_lock);
}
}