nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Redox: Fix Condvar.wait(); do not lock mutex twice

Browse Source 
The atomic_xchg() loop locks the mutex, so the call to mutex_lock is
incorrect, and blocks.
This commit is contained in:
Ian Douglas Scott 2017-07-05 12:00:46 -07:00
parent 703341051d
commit 59981e4057
No known key found for this signature in database
GPG Key ID: 4924E10E199B5959
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libstd/sys/redox/condvar.rs
View File

@ -13,7 +13,7 @@ use intrinsics::{atomic_cxchg, atomic_xadd, atomic_xchg};
use ptr;
use time::Duration;
use sys::mutex::{mutex_lock, mutex_unlock, Mutex};
use sys::mutex::{mutex_unlock, Mutex};
use sys::syscall::{futex, FUTEX_WAIT, FUTEX_WAKE, FUTEX_REQUEUE};
pub struct Condvar {
@ -83,8 +83,6 @@ impl Condvar {
while atomic_xchg(*lock, 2) != 0 {
let _ = futex(*lock, FUTEX_WAIT, 2, 0, ptr::null_mut());
}
mutex_lock(*lock);
}
}