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

Rollup merge of #89068 - bjorn3:restructure_rt2, r=joshtriplett

Browse Source 
Restructure std::rt (part 2)

A couple more cleanups on top of https://github.com/rust-lang/rust/pull/89011

Blocked on #89011
This commit is contained in:
Matthias Krüger
2021-10-31 13:20:04 +01:00
committed by GitHub
parent 58899c4d9c 0cc4cce057
commit 6c5aa765fb
4 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
library/std/src/sys/unix/stack_overflow.rs
View File

@@ -6,7 +6,7 @@ pub use self::imp::cleanup;
pub use self::imp::init;
pub struct Handler {
_data: *mut libc::c_void,
data: *mut libc::c_void,
}
impl Handler {
@@ -15,14 +15,14 @@ impl Handler {
}
fn null() -> Handler {
Handler { _data: crate::ptr::null_mut() }
Handler { data: crate::ptr::null_mut() }
}
}
impl Drop for Handler {
fn drop(&mut self) {
unsafe {
drop_handler(self);
drop_handler(self.data);
}
}
}
@@ -134,12 +134,12 @@ mod imp {
}
let handler = make_handler();
MAIN_ALTSTACK.store(handler._data, Ordering::Relaxed);
MAIN_ALTSTACK.store(handler.data, Ordering::Relaxed);
mem::forget(handler);
}
pub unsafe fn cleanup() {
Handler { _data: MAIN_ALTSTACK.load(Ordering::Relaxed) };
drop_handler(MAIN_ALTSTACK.load(Ordering::Relaxed));
}
unsafe fn get_stackp() -> *mut libc::c_void {
@@ -176,14 +176,14 @@ mod imp {
if stack.ss_flags & SS_DISABLE != 0 {
stack = get_stack();
sigaltstack(&stack, ptr::null_mut());
Handler { _data: stack.ss_sp as *mut libc::c_void }
Handler { data: stack.ss_sp as *mut libc::c_void }
} else {
Handler::null()
}
}
pub unsafe fn drop_handler(handler: &mut Handler) {
if !handler._data.is_null() {
pub unsafe fn drop_handler(data: *mut libc::c_void) {
if !data.is_null() {
let stack = libc::stack_t {
ss_sp: ptr::null_mut(),
ss_flags: SS_DISABLE,
@@ -196,7 +196,7 @@ mod imp {
sigaltstack(&stack, ptr::null_mut());
// We know from `get_stackp` that the alternate stack we installed is part of a mapping
// that started one page earlier, so walk back a page and unmap from there.
munmap(handler._data.sub(page_size()), SIGSTKSZ + page_size());
munmap(data.sub(page_size()), SIGSTKSZ + page_size());
}
}
}
@@ -220,5 +220,5 @@ mod imp {
super::Handler::null()
}
pub unsafe fn drop_handler(_handler: &mut super::Handler) {}
pub unsafe fn drop_handler(_data: *mut libc::c_void) {}
}