Skip to content
Permalink
Browse files

Fix silent error, add custom panic handler (#2098)

This is to work around Tokio's panic recovery feature.
Ref tokio-rs/tokio#495
Ref tokio-rs/tokio#209
Ref #1311
Fixes #2097
  • Loading branch information...
ry committed Apr 14, 2019
1 parent b413cd5 commit c7e1f8fabdc87d3622fd94769c57197d5dfecad3
Showing with 19 additions and 2 deletions.
  1. +2 −0 cli/compiler.rs
  2. +16 −1 cli/tokio_util.rs
  3. +1 −1 cli/worker.rs
@@ -111,6 +111,8 @@ fn lazy_start(parent_state: ThreadSafeState) -> ResourceId {

let mut runtime = C_RUNTIME.lock().unwrap();
runtime.spawn(lazy(move || {
tokio_util::abort_on_panic();

worker.then(move |result| -> Result<(), ()> {
// Close resource so the future created by
// handle_worker_message_stream exits
@@ -13,10 +13,22 @@ pub fn run<F>(future: F)
where
F: Future<Item = (), Error = ()> + Send + 'static,
{
abort_on_panic();
// tokio::runtime::current_thread::run(future)
tokio::run(future)
}

// Tokio swallows panics. In order to actually crash when we panic, we
// have to set this custom hook.
// https://github.com/tokio-rs/tokio/issues/495
// https://github.com/tokio-rs/tokio/issues/209
pub fn abort_on_panic() {
std::panic::set_hook(Box::new(|panic_info| {
eprintln!("{}", panic_info.to_string());
std::process::abort();
}));
}

pub fn block_on<F, R, E>(future: F) -> Result<R, E>
where
F: Send + 'static + Future<Item = R, Error = E>,
@@ -40,7 +52,10 @@ where
let rt = tokio::runtime::Runtime::new().unwrap();
let mut executor = rt.executor();
let mut enter = tokio_executor::enter().expect("Multiple executors at once");
tokio_executor::with_default(&mut executor, &mut enter, move |_enter| f());
tokio_executor::with_default(&mut executor, &mut enter, move |_enter| {
abort_on_panic();
f()
});
}

#[derive(Debug)]
@@ -324,7 +324,7 @@ mod tests {
onmessage = function(e) {
console.log("msg from main script", e.data);
if (e.data == "exit") {
close();
delete window.onmessage;
return;
} else {
console.assert(e.data === "hi");

0 comments on commit c7e1f8f

Please sign in to comment.
You can’t perform that action at this time.