Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Lock stderr in custom panic handler

Browse source
This commit is contained in:
Manish Goregaokar 2016-04-01 10:18:10 +05:30
parent ed3f7f5818
commit 1aa6d558ac
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/util/thread.rs
View file

@ -11,7 +11,7 @@ use std::sync::mpsc::Sender;
use std::thread; use std::thread;
use std::thread::Builder; use std::thread::Builder;
use thread_state; use thread_state;
#[allow(unused_must_use)]
pub fn spawn_named<F>(name: String, f: F) pub fn spawn_named<F>(name: String, f: F)
where F: FnOnce() + Send + 'static where F: FnOnce() + Send + 'static
{ {
@ -24,11 +24,15 @@ pub fn spawn_named<F>(name: String, f: F)
let payload = info.payload(); let payload = info.payload();
if let Some(s) = payload.downcast_ref::<String>() { if let Some(s) = payload.downcast_ref::<String>() {
if s.contains("SendError") { if s.contains("SendError") {
write!(stderr(), "Thread \"{}\" panicked with an unwrap of `SendError` (backtrace skipped)\n", let err = stderr();
let _ = write!(err.lock(), "Thread \"{}\" panicked with an unwrap of \
`SendError` (backtrace skipped)\n",
thread::current().name().unwrap_or("<unknown thread>")); thread::current().name().unwrap_or("<unknown thread>"));
return; return;
} else if s.contains("RecvError") { } else if s.contains("RecvError") {
write!(stderr(), "Thread \"{}\" panicked with an unwrap of `RecvError` (backtrace skipped)\n", let err = stderr();
let _ = write!(err.lock(), "Thread \"{}\" panicked with an unwrap of \
`RecvError` (backtrace skipped)\n",
thread::current().name().unwrap_or("<unknown thread>")); thread::current().name().unwrap_or("<unknown thread>"));
return; return;
} }