Miri can set thread names now (#5108)
# Objective https://github.com/rust-lang/miri/issues/1717 has been fixed so we can set thread names in Miri now. ## Solution We set thread names in Miri.
This commit is contained in:
parent
e57abc1c42
commit
a32eac825a
@ -102,23 +102,12 @@ impl TaskPool {
|
|||||||
let ex = Arc::clone(&executor);
|
let ex = Arc::clone(&executor);
|
||||||
let shutdown_rx = shutdown_rx.clone();
|
let shutdown_rx = shutdown_rx.clone();
|
||||||
|
|
||||||
// miri does not support setting thread names
|
let thread_name = if let Some(thread_name) = thread_name {
|
||||||
// TODO: change back when https://github.com/rust-lang/miri/issues/1717 is fixed
|
format!("{} ({})", thread_name, i)
|
||||||
#[cfg(not(miri))]
|
} else {
|
||||||
let mut thread_builder = {
|
format!("TaskPool ({})", i)
|
||||||
let thread_name = if let Some(thread_name) = thread_name {
|
|
||||||
format!("{} ({})", thread_name, i)
|
|
||||||
} else {
|
|
||||||
format!("TaskPool ({})", i)
|
|
||||||
};
|
|
||||||
thread::Builder::new().name(thread_name)
|
|
||||||
};
|
|
||||||
#[cfg(miri)]
|
|
||||||
let mut thread_builder = {
|
|
||||||
let _ = i;
|
|
||||||
let _ = thread_name;
|
|
||||||
thread::Builder::new()
|
|
||||||
};
|
};
|
||||||
|
let mut thread_builder = thread::Builder::new().name(thread_name);
|
||||||
|
|
||||||
if let Some(stack_size) = stack_size {
|
if let Some(stack_size) = stack_size {
|
||||||
thread_builder = thread_builder.stack_size(stack_size);
|
thread_builder = thread_builder.stack_size(stack_size);
|
||||||
|
Loading…
Reference in New Issue
Block a user