From 6016f951ef6944e8042fc3c6d9aaa76a7d78512d Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Thu, 6 Apr 2023 14:34:13 +0800 Subject: [PATCH] kernel: gdb: unpause process on disconnect Resume the debugged process when the debugger disconnects. Signed-off-by: Sean Cross --- kernel/src/debug/gdb.rs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/kernel/src/debug/gdb.rs b/kernel/src/debug/gdb.rs index 890d5c468..c39ec920e 100644 --- a/kernel/src/debug/gdb.rs +++ b/kernel/src/debug/gdb.rs @@ -37,12 +37,16 @@ static mut GDB_BUFFER: [u8; 4096] = [0u8; 4096]; trait ProcessPid { fn pid(&self) -> Option; + fn take_pid(&mut self) -> Option; } impl ProcessPid for XousTarget { fn pid(&self) -> Option { self.pid } + fn take_pid(&mut self) -> Option { + self.pid.take() + } } fn receive_irq(uart: &mut GdbUart) { @@ -94,8 +98,6 @@ fn ensure_can_accept_characters_inner<'a, T: Target + ProcessPid, C: Connection> println!("Unable to pause process {:?} for debug: {:?}", pid, e); } }); - } else { - println!("No process specified! Not debugging"); } let Ok(new_server) = gdb_stm_inner.interrupt_handled(target, Some(MultiThreadStopReason::Signal(Signal::SIGINT))) else { @@ -104,10 +106,12 @@ fn ensure_can_accept_characters_inner<'a, T: Target + ProcessPid, C: Connection> ensure_can_accept_characters_inner(new_server, target, recurse_count - 1) } GdbStubStateMachine::Disconnected(gdb_stm_inner) => { - println!( - "GdbStubStateMachine::Disconnected due to {:?}", - gdb_stm_inner.get_reason() - ); + if let Some(pid) = target.take_pid() { + crate::services::SystemServices::with_mut(|system_services| { + system_services.resume_process_from_debug(pid).unwrap() + }); + } + ensure_can_accept_characters_inner( gdb_stm_inner.return_to_idle(), target,