implements PR014 a PR016
This commit is contained in:
@@ -27,6 +27,12 @@ pub struct HostDebugger {
|
||||
last_fault_summary: Option<String>,
|
||||
}
|
||||
|
||||
impl Default for HostDebugger {
|
||||
fn default() -> Self {
|
||||
Self::new()
|
||||
}
|
||||
}
|
||||
|
||||
impl HostDebugger {
|
||||
/// Creates a new debugger interface in an idle state.
|
||||
pub fn new() -> Self {
|
||||
@@ -70,21 +76,21 @@ impl HostDebugger {
|
||||
|
||||
/// Sends a structured response to the connected debugger client.
|
||||
fn send_response(&mut self, resp: DebugResponse) {
|
||||
if let Some(stream) = &mut self.stream {
|
||||
if let Ok(json) = serde_json::to_string(&resp) {
|
||||
let _ = stream.write_all(json.as_bytes());
|
||||
let _ = stream.write_all(b"\n");
|
||||
}
|
||||
if let Some(stream) = &mut self.stream
|
||||
&& let Ok(json) = serde_json::to_string(&resp)
|
||||
{
|
||||
let _ = stream.write_all(json.as_bytes());
|
||||
let _ = stream.write_all(b"\n");
|
||||
}
|
||||
}
|
||||
|
||||
/// Sends an asynchronous event to the connected debugger client.
|
||||
fn send_event(&mut self, event: DebugEvent) {
|
||||
if let Some(stream) = &mut self.stream {
|
||||
if let Ok(json) = serde_json::to_string(&event) {
|
||||
let _ = stream.write_all(json.as_bytes());
|
||||
let _ = stream.write_all(b"\n");
|
||||
}
|
||||
if let Some(stream) = &mut self.stream
|
||||
&& let Ok(json) = serde_json::to_string(&event)
|
||||
{
|
||||
let _ = stream.write_all(json.as_bytes());
|
||||
let _ = stream.write_all(b"\n");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -92,31 +98,31 @@ impl HostDebugger {
|
||||
/// It handles new connections and processes incoming commands.
|
||||
pub fn check_commands(&mut self, firmware: &mut Firmware, hardware: &mut Hardware) {
|
||||
// 1. Accept new client connections.
|
||||
if let Some(listener) = &self.listener {
|
||||
if let Ok((stream, _addr)) = listener.accept() {
|
||||
// Currently, only one debugger client is supported at a time.
|
||||
if self.stream.is_none() {
|
||||
println!("[Debugger] Connection received!");
|
||||
stream.set_nonblocking(true).expect("Cannot set non-blocking on stream");
|
||||
if let Some(listener) = &self.listener
|
||||
&& let Ok((stream, _addr)) = listener.accept()
|
||||
{
|
||||
// Currently, only one debugger client is supported at a time.
|
||||
if self.stream.is_none() {
|
||||
println!("[Debugger] Connection received!");
|
||||
stream.set_nonblocking(true).expect("Cannot set non-blocking on stream");
|
||||
|
||||
self.stream = Some(stream);
|
||||
self.last_fault_summary = None;
|
||||
self.stream = Some(stream);
|
||||
self.last_fault_summary = None;
|
||||
|
||||
// Immediately send the Handshake message to identify the Runtime and App.
|
||||
let handshake = DebugResponse::Handshake {
|
||||
protocol_version: DEVTOOLS_PROTOCOL_VERSION,
|
||||
runtime_version: "0.1".to_string(),
|
||||
cartridge: HandshakeCartridge {
|
||||
app_id: firmware.os.current_app_id,
|
||||
title: firmware.os.current_cartridge_title.clone(),
|
||||
app_version: firmware.os.current_cartridge_app_version.clone(),
|
||||
app_mode: firmware.os.current_cartridge_app_mode,
|
||||
},
|
||||
};
|
||||
self.send_response(handshake);
|
||||
} else {
|
||||
println!("[Debugger] Connection refused: already connected.");
|
||||
}
|
||||
// Immediately send the Handshake message to identify the Runtime and App.
|
||||
let handshake = DebugResponse::Handshake {
|
||||
protocol_version: DEVTOOLS_PROTOCOL_VERSION,
|
||||
runtime_version: "0.1".to_string(),
|
||||
cartridge: HandshakeCartridge {
|
||||
app_id: firmware.os.current_app_id,
|
||||
title: firmware.os.current_cartridge_title.clone(),
|
||||
app_version: firmware.os.current_cartridge_app_version.clone(),
|
||||
app_mode: firmware.os.current_cartridge_app_mode,
|
||||
},
|
||||
};
|
||||
self.send_response(handshake);
|
||||
} else {
|
||||
println!("[Debugger] Connection refused: already connected.");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user