-
Notifications
You must be signed in to change notification settings - Fork 13.6k
use MaybeUninit instead of mem::uninitialized for Windows Mutex #56275
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.
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
Merged
Merged
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 a810275
fix build
RalfJung 2f2f379
add missing feature
RalfJung a4f1234
add comments explaining our uses of get_ref/get_mut for MaybeUninit
RalfJung 12d90aa
put the MaybeUninit inside the UnsafeCell
RalfJung 965fdb0
fix build
RalfJung dd593d3
get_ref -> get_mut
RalfJung f9fb8d6
no reason to use mutable references here at all
RalfJung f4f8b21
let FIXME refer to tracking issue
RalfJung ebe69c0
avoid MaybeUninit::get_mut where it is not needed
RalfJung File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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; | ||
|
@@ -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>> } | ||
|
||
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() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Looks like you forgot to wrap this in There was a problem hiding this comment. Choose a reason for hiding this commentThe 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()); | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.