From c30bd0e029cde0a777001777351334c0862fd059 Mon Sep 17 00:00:00 2001 From: davidxu Date: Tue, 10 Jun 2003 02:21:32 +0000 Subject: If there are signals delivered to current thread, breaks out of loop, userret() will be called again by ast() and thread_userret() will be called again by userret(). Reported by: tegge --- sys/kern/kern_kse.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'sys/kern/kern_kse.c') diff --git a/sys/kern/kern_kse.c b/sys/kern/kern_kse.c index ed37c48..4c2f592 100644 --- a/sys/kern/kern_kse.c +++ b/sys/kern/kern_kse.c @@ -1637,8 +1637,6 @@ thread_userret(struct thread *td, struct trapframe *frame) PROC_LOCK(p); mtx_lock_spin(&sched_lock); while (p->p_numthreads > max_threads_per_proc) { - if (P_SHOULDSTOP(p)) - break; upcalls = 0; FOREACH_KSEGRP_IN_PROC(p, kg2) { if (kg2->kg_numupcalls == 0) @@ -1650,8 +1648,9 @@ thread_userret(struct thread *td, struct trapframe *frame) break; mtx_unlock_spin(&sched_lock); p->p_maxthrwaits++; - msleep(&p->p_numthreads, &p->p_mtx, PPAUSE|PCATCH, - "maxthreads", NULL); + if (msleep(&p->p_numthreads, &p->p_mtx, PPAUSE|PCATCH, + "maxthreads", NULL)) + break; p->p_maxthrwaits--; mtx_lock_spin(&sched_lock); } -- cgit v1.1