rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rust_cond_lock acquire/release should be inside the atomically { .. }

Browse Source
This commit is contained in:
Ben Blum
2012-07-24 20:28:30 -04:00
parent bb5db3bc8a
commit a038d272b0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libcore/sys.rs
View File

@@ -105,17 +105,17 @@ class unlock {
impl methods for lock_and_signal { impl methods for lock_and_signal {
unsafe fn lock<T>(f: fn() -> T) -> T { unsafe fn lock<T>(f: fn() -> T) -> T {
do atomically {
rustrt::rust_lock_cond_lock(self.lock); rustrt::rust_lock_cond_lock(self.lock);
let _r = unlock(self.lock); let _r = unlock(self.lock);
do atomically {
f() f()
} }
} }
unsafe fn lock_cond<T>(f: fn(condition) -> T) -> T { unsafe fn lock_cond<T>(f: fn(condition) -> T) -> T {
do atomically {
rustrt::rust_lock_cond_lock(self.lock); rustrt::rust_lock_cond_lock(self.lock);
let _r = unlock(self.lock); let _r = unlock(self.lock);
do atomically {
f(condition_(self.lock)) f(condition_(self.lock))
} }
} }