78495d5082
Previously, the thread name (&str) was converted to a CString in the new thread, but outside unwind::try, causing a panic to continue into FFI. This patch changes that behaviour, so that the panic instead happens in the parent thread (where panic infrastructure is properly set up), not the new thread. This could potentially be a breaking change for architectures who don't support thread names. Signed-off-by: David Henningsson <diwic@ubuntu.com>
90 lines
2.9 KiB
Rust
90 lines
2.9 KiB
Rust
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
|
// file at the top-level directory of this distribution and at
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
// option. This file may not be copied, modified, or distributed
|
|
// except according to those terms.
|
|
|
|
use prelude::v1::*;
|
|
|
|
use alloc::boxed::FnBox;
|
|
use io;
|
|
use mem;
|
|
use libc::c_void;
|
|
use ptr;
|
|
use sys::c;
|
|
use sys::handle::Handle;
|
|
use sys_common::thread::*;
|
|
use time::Duration;
|
|
|
|
pub struct Thread {
|
|
handle: Handle
|
|
}
|
|
|
|
impl Thread {
|
|
pub unsafe fn new<'a>(stack: usize, p: Box<FnBox() + 'a>)
|
|
-> io::Result<Thread> {
|
|
let p = box p;
|
|
|
|
// FIXME On UNIX, we guard against stack sizes that are too small but
|
|
// that's because pthreads enforces that stacks are at least
|
|
// PTHREAD_STACK_MIN bytes big. Windows has no such lower limit, it's
|
|
// just that below a certain threshold you can't do anything useful.
|
|
// That threshold is application and architecture-specific, however.
|
|
// Round up to the next 64 kB because that's what the NT kernel does,
|
|
// might as well make it explicit.
|
|
let stack_size = (stack + 0xfffe) & (!0xfffe);
|
|
let ret = c::CreateThread(ptr::null_mut(), stack_size,
|
|
thread_start, &*p as *const _ as *mut _,
|
|
0, ptr::null_mut());
|
|
|
|
return if ret as usize == 0 {
|
|
Err(io::Error::last_os_error())
|
|
} else {
|
|
mem::forget(p); // ownership passed to CreateThread
|
|
Ok(Thread { handle: Handle::new(ret) })
|
|
};
|
|
|
|
extern "system" fn thread_start(main: *mut c_void) -> c::DWORD {
|
|
unsafe { start_thread(main); }
|
|
0
|
|
}
|
|
}
|
|
|
|
pub fn set_name(_name: &CStr) {
|
|
// Windows threads are nameless
|
|
// The names in MSVC debugger are obtained using a "magic" exception,
|
|
// which requires a use of MS C++ extensions.
|
|
// See https://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx
|
|
}
|
|
|
|
pub fn join(self) {
|
|
unsafe { c::WaitForSingleObject(self.handle.raw(), c::INFINITE); }
|
|
}
|
|
|
|
pub fn yield_now() {
|
|
// This function will return 0 if there are no other threads to execute,
|
|
// but this also means that the yield was useless so this isn't really a
|
|
// case that needs to be worried about.
|
|
unsafe { c::SwitchToThread(); }
|
|
}
|
|
|
|
pub fn sleep(dur: Duration) {
|
|
unsafe {
|
|
c::Sleep(super::dur2timeout(dur))
|
|
}
|
|
}
|
|
|
|
pub fn handle(&self) -> &Handle { &self.handle }
|
|
|
|
pub fn into_handle(self) -> Handle { self.handle }
|
|
}
|
|
|
|
#[cfg_attr(test, allow(dead_code))]
|
|
pub mod guard {
|
|
pub unsafe fn current() -> Option<usize> { None }
|
|
pub unsafe fn init() -> Option<usize> { None }
|
|
}
|