diff options
| -rw-r--r-- | sys/kern/kern_condvar.c | 11 | ||||
| -rw-r--r-- | sys/kern/kern_synch.c | 13 |
2 files changed, 21 insertions, 3 deletions
diff --git a/sys/kern/kern_condvar.c b/sys/kern/kern_condvar.c index 55fba60..1a99686 100644 --- a/sys/kern/kern_condvar.c +++ b/sys/kern/kern_condvar.c @@ -612,7 +612,16 @@ cv_timedwait_end(void *arg) mtx_lock_spin(&sched_lock); if (td->td_flags & TDF_TIMEOUT) { td->td_flags &= ~TDF_TIMEOUT; - setrunqueue(td); + if (td->td_proc->p_sflag & PS_INMEM) { + setrunqueue(td); + maybe_resched(td); + } else { + td->td_state = TDS_SWAPPED; + if ((td->td_proc->p_sflag & PS_SWAPPINGIN) == 0) { + td->td_proc->p_sflag |= PS_SWAPINREQ; + wakeup(&proc0); + } + } } else if (td->td_wchan != NULL) { if (td->td_state == TDS_SLP) /* XXXKSE */ setrunnable(td); diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 9e60459..e32a681 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -621,12 +621,21 @@ endtsleep(arg) mtx_lock_spin(&sched_lock); /* * This is the other half of the synchronization with msleep() - * described above. If the PS_TIMEOUT flag is set, we lost the + * described above. If the TDS_TIMEOUT flag is set, we lost the * race and just need to put the process back on the runqueue. */ if ((td->td_flags & TDF_TIMEOUT) != 0) { td->td_flags &= ~TDF_TIMEOUT; - setrunqueue(td); + if (td->td_proc->p_sflag & PS_INMEM) { + setrunqueue(td); + maybe_resched(td); + } else { + td->td_state = TDS_SWAPPED; + if ((td->td_proc->p_sflag & PS_SWAPPINGIN) == 0) { + td->td_proc->p_sflag |= PS_SWAPINREQ; + wakeup(&proc0); + } + } } else if (td->td_wchan != NULL) { if (td->td_state == TDS_SLP) /* XXXKSE */ setrunnable(td); |
