Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use MaybeUninit instead of mem::uninitialized for Windows Mutex #56275

Merged
merged 10 commits into from
Dec 2, 2018
Merged

use MaybeUninit instead of mem::uninitialized for Windows Mutex #56275

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f2af41a
use MaybeUninit instead of mem::uninitialized for Windows Mutex
RalfJung Nov 27, 2018
a810275
fix build
RalfJung Nov 27, 2018
2f2f379
add missing feature
RalfJung Nov 27, 2018
a4f1234
add comments explaining our uses of get_ref/get_mut for MaybeUninit
RalfJung Nov 27, 2018
12d90aa
put the MaybeUninit inside the UnsafeCell
RalfJung Nov 28, 2018
965fdb0
fix build
RalfJung Nov 28, 2018
dd593d3
get_ref -> get_mut
RalfJung Nov 28, 2018
f9fb8d6
no reason to use mutable references here at all
RalfJung Dec 2, 2018
f4f8b21
let FIXME refer to tracking issue
RalfJung Dec 2, 2018
ebe69c0
avoid MaybeUninit::get_mut where it is not needed
RalfJung Dec 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/libstd/sys/windows/mutex.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
//! detect recursive locks.

use cell::UnsafeCell;
use mem;
use mem::{self, MaybeUninit};
use sync::atomic::{AtomicUsize, Ordering};
use sys::c;
use sys::compat;
Expand Down Expand Up @@ -157,34 +157,34 @@ fn kind() -> Kind {
return ret;
}

pub struct ReentrantMutex { inner: UnsafeCell<c::CRITICAL_SECTION> }
pub struct ReentrantMutex { inner: MaybeUninit<UnsafeCell<c::CRITICAL_SECTION>> }
RalfJung marked this conversation as resolved.
Show resolved Hide resolved

unsafe impl Send for ReentrantMutex {}
unsafe impl Sync for ReentrantMutex {}

impl ReentrantMutex {
pub unsafe fn uninitialized() -> ReentrantMutex {
mem::uninitialized()
pub fn uninitialized() -> ReentrantMutex {
MaybeUninit::uninitialized()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like you forgot to wrap this in ReentrantMutex.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I forgot indeed, thanks!

}

pub unsafe fn init(&mut self) {
c::InitializeCriticalSection(self.inner.get());
c::InitializeCriticalSection(self.inner.get_ref().get());
}

pub unsafe fn lock(&self) {
c::EnterCriticalSection(self.inner.get());
c::EnterCriticalSection(self.inner.get_ref().get());
}

#[inline]
pub unsafe fn try_lock(&self) -> bool {
c::TryEnterCriticalSection(self.inner.get()) != 0
c::TryEnterCriticalSection(self.inner.get_ref().get()) != 0
}

pub unsafe fn unlock(&self) {
c::LeaveCriticalSection(self.inner.get());
c::LeaveCriticalSection(self.inner.get_ref().get());
}

pub unsafe fn destroy(&self) {
c::DeleteCriticalSection(self.inner.get());
c::DeleteCriticalSection(self.inner.get_ref().get());
}
}