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

Fix signal delivering bug for threaded process.

Browse Source
This commit is contained in:
David Xu 2003-03-11 02:59:50 +00:00
parent bdc321a648
commit 21e0492ab1
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/kern/kern_kse.c
View File

@ -1601,14 +1601,12 @@ thread_userret(struct thread *td, struct trapframe *frame)
mtx_lock_spin(&sched_lock);
td->td_flags &= ~TDF_CAN_UNBIND;
mtx_unlock_spin(&sched_lock);
if ((kg->kg_completed == NULL) &&
if ((p->p_flag & PS_NEEDSIGCHK) == 0 &&
(kg->kg_completed == NULL) &&
(td->td_upcall->ku_flags & KUF_DOUPCALL) == 0) {
thread_update_usr_ticks(td, 0);
if (!(kg->kg_completed ||
(td->td_upcall->ku_flags & KUF_DOUPCALL))) {
td->td_mailbox = NULL;
return (0);
}
td->td_mailbox = 0;
return (0);
}
error = thread_export_context(td);
if (error) {

10
sys/kern/kern_thread.c
View File

@ -1601,14 +1601,12 @@ thread_userret(struct thread *td, struct trapframe *frame)
mtx_lock_spin(&sched_lock);
td->td_flags &= ~TDF_CAN_UNBIND;
mtx_unlock_spin(&sched_lock);
if ((kg->kg_completed == NULL) &&
if ((p->p_flag & PS_NEEDSIGCHK) == 0 &&
(kg->kg_completed == NULL) &&
(td->td_upcall->ku_flags & KUF_DOUPCALL) == 0) {
thread_update_usr_ticks(td, 0);
if (!(kg->kg_completed ||
(td->td_upcall->ku_flags & KUF_DOUPCALL))) {
td->td_mailbox = NULL;
return (0);
}
td->td_mailbox = 0;
return (0);
}
error = thread_export_context(td);
if (error) {

10
sys/kern/subr_trap.c
View File

@ -253,8 +253,14 @@ ast(struct trapframe *framep)
sigs++;
}
PROC_UNLOCK(p);
if (p->p_flag & P_THREADED && sigs)
thread_signal_upcall(td);
if (p->p_flag & P_THREADED && sigs) {
struct kse_upcall *ku = td->td_upcall;
if ((void *)TRAPF_PC(framep) != ku->ku_func) {
mtx_lock_spin(&sched_lock);
ku->ku_flags |= KUF_DOUPCALL;
mtx_unlock_spin(&sched_lock);
}
}
}
userret(td, framep, sticks);