bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #21920: vojtechkral/main-thread-name

Browse source 
Fixes #21911
This commit is contained in:
Alex Crichton 2015-02-10 08:41:34 -08:00
commit c41655b076
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstd/sys/common/thread_info.rs
View file

@ -56,10 +56,6 @@ pub fn stack_guard() -> uint {
pub fn set(stack_bounds: (uint, uint), stack_guard: uint, thread: Thread) { pub fn set(stack_bounds: (uint, uint), stack_guard: uint, thread: Thread) {
THREAD_INFO.with(|c| assert!(c.borrow().is_none())); THREAD_INFO.with(|c| assert!(c.borrow().is_none()));
match thread.name() {
Some(name) => unsafe { ::sys::thread::set_name(name); },
None => {}
}
THREAD_INFO.with(move |c| *c.borrow_mut() = Some(ThreadInfo{ THREAD_INFO.with(move |c| *c.borrow_mut() = Some(ThreadInfo{
stack_bounds: stack_bounds, stack_bounds: stack_bounds,
stack_guard: stack_guard, stack_guard: stack_guard,

5
src/libstd/thread.rs
View file

@ -156,6 +156,7 @@ use ops::{Drop, FnOnce};
use option::Option::{self, Some, None}; use option::Option::{self, Some, None};
use result::Result::{Err, Ok}; use result::Result::{Err, Ok};
use sync::{Mutex, Condvar, Arc}; use sync::{Mutex, Condvar, Arc};
use str::Str;
use string::String; use string::String;
use rt::{self, unwind}; use rt::{self, unwind};
use old_io::{Writer, stdio}; use old_io::{Writer, stdio};
@ -280,6 +281,10 @@ impl Builder {
unsafe { unsafe {
stack::record_os_managed_stack_bounds(my_stack_bottom, my_stack_top); stack::record_os_managed_stack_bounds(my_stack_bottom, my_stack_top);
} }
match their_thread.name() {
Some(name) => unsafe { imp::set_name(name.as_slice()); },
None => {}
}
thread_info::set( thread_info::set(
(my_stack_bottom, my_stack_top), (my_stack_bottom, my_stack_top),
unsafe { imp::guard::current() }, unsafe { imp::guard::current() },