user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify wait_timeout_until & fix condition typo

Browse source
This commit is contained in:
Vitali Lovich 2018-02-05 15:11:00 -08:00
parent e72bd6df53
commit 95e4dc2ad1
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libstd/sync/condvar.rs
View file

@ -475,17 +475,16 @@ impl Condvar {
mut dur: Duration, mut condition: F)
-> LockResult<(MutexGuard<'a, T>, WaitTimeoutResult)>
where F: FnMut(&mut T) -> bool {
let timed_out = Duration::new(0, 0);
let start = Instant::now();
loop {
if !condition(&mut *guard) {
if condition(&mut *guard) {
return Ok((guard, WaitTimeoutResult(false)));
} else if dur == timed_out {
return Ok((guard, WaitTimeoutResult(true)));
}
let wait_timer = Instant::now();
let wait_result = self.wait_timeout(guard, dur)?;
dur = dur.checked_sub(wait_timer.elapsed()).unwrap_or(timed_out);
guard = wait_result.0;
let timeout = match dur.checked_sub(start.elapsed()) {
Some(timeout) => timeout,
None => return Ok((guard, WaitTimeoutResult(true))),
}
guard = self.wait_timeout(guard, dur)?.0;
}
}