nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-18 09:53:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplifying get_stack

Browse Source
This commit is contained in:
Dave Huseby 2016-02-02 09:23:33 -08:00
parent 7803c8d688
commit 68bfd43eef
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/libstd/sys/unix/stack_overflow.rs
View File

@ -135,12 +135,7 @@ mod imp {
Handler { _data: MAIN_ALTSTACK };
}
#[cfg(any(target_os = "linux",
target_os = "macos",
target_os = "bitrig",
target_os = "netbsd",
target_os = "openbsd"))]
unsafe fn get_stack() -> libc::stack_t {
unsafe fn get_stack() -> *mut i8 {
let stackp = mmap(ptr::null_mut(),
SIGSTKSZ,
PROT_READ | PROT_WRITE,
@ -150,27 +145,11 @@ mod imp {
if stackp == MAP_FAILED {
panic!("failed to allocate an alternative stack");
}
libc::stack_t { ss_sp: stackp, ss_flags: 0, ss_size: SIGSTKSZ }
stackp as *mut i8
}
#[cfg(any(target_os = "dragonfly",
target_os = "freebsd"))]
unsafe fn get_stack() -> libc::stack_t {
let stackp = mmap(ptr::null_mut(),
SIGSTKSZ,
PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANON,
-1,
0);
if stackp == MAP_FAILED {
panic!("failed to allocate an alternative stack");
}
libc::stack_t { ss_sp: stackp as *mut i8, ss_flags: 0, ss_size: SIGSTKSZ }
}
pub unsafe fn make_handler() -> Handler {
let stack = get_stack();
let stack = libc::stack_t { ss_sp: get_stack(), ss_flags: 0, ss_size: SIGSTKSZ }
sigaltstack(&stack, ptr::null_mut());
Handler { _data: stack.ss_sp as *mut libc::c_void }
}