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

std: Fail more gracefully on thread spawn errors #13606

Merged
merged 1 commit into from
Apr 19, 2014
Merged

std: Fail more gracefully on thread spawn errors #13606

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 17 additions & 4 deletions src/libstd/rt/thread.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ mod imp {
use libc;
use libc::types::os::arch::extra::{LPSECURITY_ATTRIBUTES, SIZE_T, BOOL,
LPVOID, DWORD, LPDWORD, HANDLE};
use os;
use ptr;
use rt::stack::RED_ZONE;

Expand All @@ -168,8 +169,15 @@ mod imp {
// kernel does, might as well make it explicit. With the current
// 20 kB red zone, that makes for a 64 kB minimum stack.
let stack_size = (cmp::max(stack, RED_ZONE) + 0xfffe) & (-0xfffe - 1);
CreateThread(ptr::mut_null(), stack_size as libc::size_t,
super::thread_start, arg, 0, ptr::mut_null())
let ret = CreateThread(ptr::mut_null(), stack_size as libc::size_t,
super::thread_start, arg, 0, ptr::mut_null());

if ret as uint == 0 {
// be sure to not leak the closure
let _p: ~proc():Send = cast::transmute(arg);
fail!("failed to spawn native thread: {}", os::last_os_error());
}
return ret;
}

pub unsafe fn join(native: rust_thread) {
Expand Down Expand Up @@ -243,9 +251,14 @@ mod imp {
};

let arg: *libc::c_void = cast::transmute(p);
assert_eq!(pthread_create(&mut native, &attr,
super::thread_start, arg), 0);
let ret = pthread_create(&mut native, &attr, super::thread_start, arg);
assert_eq!(pthread_attr_destroy(&mut attr), 0);

if ret != 0 {
// be sure to not leak the closure
let _p: ~proc():Send = cast::transmute(arg);
fail!("failed to spawn native thread: {}", os::last_os_error());
}
native
}

Expand Down