diff options
| author | David Xu <davidxu@FreeBSD.org> | 2003-07-02 01:19:15 +0000 |
|---|---|---|
| committer | David Xu <davidxu@FreeBSD.org> | 2003-07-02 01:19:15 +0000 |
| commit | 34178711be94c48e0cbe3b5f9c195a3c7d66ba57 (patch) | |
| tree | 9c483ef522c95ae592986622a8ade858212303f0 | |
| parent | e9693da9e1dd21b3073a987a3ca14d6cf17ffd6d (diff) | |
Notes
| -rw-r--r-- | sys/kern/kern_condvar.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/kern/kern_condvar.c b/sys/kern/kern_condvar.c index f43018c378350..3344123e80e50 100644 --- a/sys/kern/kern_condvar.c +++ b/sys/kern/kern_condvar.c @@ -287,8 +287,11 @@ cv_wait_sig(struct cv *cvp, struct mtx *mp) PROC_LOCK(p); mtx_lock(&p->p_sigacts->ps_mtx); - if (sig == 0) + if (sig == 0) { sig = cursig(td); /* XXXKSE */ + if (sig == 0 && td->td_flags & TDF_INTERRUPT) + rval = td->td_intrval; + } if (sig != 0) { if (SIGISMEMBER(p->p_sigacts->ps_sigintr, sig)) rval = EINTR; @@ -452,8 +455,11 @@ cv_timedwait_sig(struct cv *cvp, struct mtx *mp, int timo) PROC_LOCK(p); mtx_lock(&p->p_sigacts->ps_mtx); - if (sig == 0) + if (sig == 0) { sig = cursig(td); + if (sig == 0 && td->td_flags & TDF_INTERRUPT) + rval = td->td_intrval; + } if (sig != 0) { if (SIGISMEMBER(p->p_sigacts->ps_sigintr, sig)) rval = EINTR; |