nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-21 20:23:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use mut in Windows Mutex.

Browse Source
This commit is contained in:
Mara Bos 2020-09-16 21:09:53 +02:00
parent 1016deb592
commit 3fadc603ab
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/std/src/sys/windows/mutex.rs
View File

@ -64,7 +64,7 @@ impl Mutex {
match kind() {
Kind::SRWLock => c::AcquireSRWLockExclusive(raw(self)),
Kind::CriticalSection => {
let inner = &mut *self.inner();
let inner = &*self.inner();
inner.remutex.lock();
if inner.held.replace(true) {
// It was already locked, so we got a recursive lock which we do not want.
@ -78,7 +78,7 @@ impl Mutex {
match kind() {
Kind::SRWLock => c::TryAcquireSRWLockExclusive(raw(self)) != 0,
Kind::CriticalSection => {
let inner = &mut *self.inner();
let inner = &*self.inner();
if !inner.remutex.try_lock() {
false
} else if inner.held.replace(true) {
@ -95,7 +95,7 @@ impl Mutex {
match kind() {
Kind::SRWLock => c::ReleaseSRWLockExclusive(raw(self)),
Kind::CriticalSection => {
let inner = &mut *(self.lock.load(Ordering::SeqCst) as *mut Inner);
let inner = &*(self.lock.load(Ordering::SeqCst) as *const Inner);
inner.held.set(false);
inner.remutex.unlock();
}
@ -106,17 +106,15 @@ impl Mutex {
Kind::SRWLock => {}
Kind::CriticalSection => match self.lock.load(Ordering::SeqCst) {
0 => {}
n => {
Box::from_raw(n as *mut Inner).remutex.destroy();
}
n => Box::from_raw(n as *mut Inner).remutex.destroy(),
},
}
}
unsafe fn inner(&self) -> *mut Inner {
unsafe fn inner(&self) -> *const Inner {
match self.lock.load(Ordering::SeqCst) {
0 => {}
n => return n as *mut _,
n => return n as *const _,
}
let inner = box Inner { remutex: ReentrantMutex::uninitialized(), held: Cell::new(false) };
inner.remutex.init();
@ -125,7 +123,7 @@ impl Mutex {
0 => inner,
n => {
Box::from_raw(inner).remutex.destroy();
n as *mut _
n as *const _
}
}
}