From 4640dc404f21b05ebd38a711786bf199c9217997 Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 1 Mar 2021 13:45:36 +0800 Subject: [PATCH] make panic messages a bit more helpful --- services/log-server/src/main.rs | 5 +++-- xous-rs/src/buffer.rs | 2 +- xous-rs/src/definitions.rs | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/services/log-server/src/main.rs b/services/log-server/src/main.rs index d14466df0..3c6362f30 100644 --- a/services/log-server/src/main.rs +++ b/services/log-server/src/main.rs @@ -182,9 +182,10 @@ fn handle_scalar( output: &mut implementation::OutputWriter, sender: xous::MessageSender, msg: &xous::ScalarMessage, + sender_pid: xous::PID, ) { match msg.id { - 1000 => writeln!(output, "PANIC in process {}", sender).unwrap(), + 1000 => writeln!(output, "PANIC from PID {} | {}", sender_pid, sender).unwrap(), 1100 => (), 1101..=1132 => { let mut output_bfr = [0u8; core::mem::size_of::() * 4]; @@ -248,7 +249,7 @@ fn reader_thread(mut output: implementation::OutputWriter) { let sender = envelope.sender; // writeln!(output, "LOG: Got message envelope: {:?}", envelope).unwrap(); match &mut envelope.body { - xous::Message::Scalar(msg) => handle_scalar(&mut output, sender, msg), + xous::Message::Scalar(msg) => handle_scalar(&mut output, sender, msg, envelope.sender.pid().unwrap()), xous::Message::BlockingScalar(msg) => { writeln!( output, diff --git a/xous-rs/src/buffer.rs b/xous-rs/src/buffer.rs index 41c6456ee..cebacbc3f 100644 --- a/xous-rs/src/buffer.rs +++ b/xous-rs/src/buffer.rs @@ -124,7 +124,7 @@ impl<'a> core::ops::DerefMut for XousBuffer<'a> { impl<'a> Drop for XousBuffer<'a> { fn drop(&mut self) { if self.should_drop { - crate::unmap_memory(self.range).unwrap(); + crate::unmap_memory(self.range).expect("XousBuffer: failed to drop memory."); } } } diff --git a/xous-rs/src/definitions.rs b/xous-rs/src/definitions.rs index 5df365393..d7ce1f3a4 100644 --- a/xous-rs/src/definitions.rs +++ b/xous-rs/src/definitions.rs @@ -37,7 +37,7 @@ impl core::default::Default for MessageSender { impl core::fmt::Display for MessageSender { fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { - write!(f, "data: {}", self.data) + write!(f, "MessageSender.data: 0x{:08x}", self.data) } }