Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #10587 - asajeffrey:add-failure-panic-message, r=Manishearth

Browse source 
Added panic message to failures.

Added the panic message to failures. This is a step towards #10334, since it gives us access to the panic error message when we fire a `mozbrowsererror` event. The remaining steps are also to record the backtrace, and to report the failure in the event.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10587)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-14 19:55:17 +05:30
commit 2b910678db
9 changed files with 88 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

35
components/util/thread.rs
View file

@ -5,6 +5,7 @@
use ipc_channel::ipc::IpcSender;
use opts;
use serde::Serialize;
use std::any::Any;
use std::borrow::ToOwned;
use std::io::{Write, stderr};
use std::panic::{PanicInfo, take_hook, set_hook};
@ -13,6 +14,8 @@ use std::thread;
use std::thread::Builder;
use thread_state;
pub type PanicReason = Option<String>;
pub fn spawn_named<F>(name: String, f: F)
where F: FnOnce() + Send + 'static
{
@ -52,6 +55,17 @@ pub fn spawn_named<F>(name: String, f: F)
builder.spawn(f_with_hook).unwrap();
}
pub trait AddFailureDetails {
fn add_panic_message(&mut self, message: String);
fn add_panic_object(&mut self, object: Box<Any>) {
if let Some(message) = object.downcast_ref::<String>() {
self.add_panic_message(message.to_owned());
} else if let Some(&message) = object.downcast_ref::<&'static str>() {
self.add_panic_message(message.to_owned());
}
}
}
/// An abstraction over `Sender<T>` and `IpcSender<T>`, for use in
/// `spawn_named_with_send_on_failure`.
pub trait SendOnFailure {
@ -62,14 +76,16 @@ pub trait SendOnFailure {
impl<T> SendOnFailure for Sender<T> where T: Send + 'static {
type Value = T;
fn send_on_failure(&mut self, value: T) {
self.send(value).unwrap();
// Discard any errors to avoid double-panic
let _ = self.send(value);
}
}
impl<T> SendOnFailure for IpcSender<T> where T: Send + Serialize + 'static {
type Value = T;
fn send_on_failure(&mut self, value: T) {
self.send(value).unwrap();
// Discard any errors to avoid double-panic
let _ = self.send(value);
}
}
@ -77,11 +93,13 @@ impl<T> SendOnFailure for IpcSender<T> where T: Send + Serialize + 'static {
pub fn spawn_named_with_send_on_failure<F, T, S>(name: String,
state: thread_state::ThreadState,
f: F,
msg: T,
mut msg: T,
mut dest: S)
where F: FnOnce() + Send + 'static,
T: Send + 'static,
S: Send + SendOnFailure<Value=T> + 'static {
where F: FnOnce() + Send + 'static,
T: Send + AddFailureDetails + 'static,
S: Send + SendOnFailure + 'static,
S::Value: From<T>,
{
let future_handle = thread::Builder::new().name(name.to_owned()).spawn(move || {
thread_state::initialize(state);
f()
@ -91,9 +109,10 @@ pub fn spawn_named_with_send_on_failure<F, T, S>(name: String,
Builder::new().name(watcher_name).spawn(move || {
match future_handle.join() {
Ok(()) => (),
Err(..) => {
Err(err) => {
debug!("{} failed, notifying constellation", name);
dest.send_on_failure(msg);
msg.add_panic_object(err);
dest.send_on_failure(S::Value::from(msg));
}
}
}).unwrap();