M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

runtime: better handling of aux timeouts

This commit is contained in:
Sebastien Bourdeauducq 2018-09-12 17:31:23 +08:00
parent 5bcd40ff59
commit e36a8536d7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artiq/firmware/runtime/rtio_mgt.rs
View File

@ -193,9 +193,9 @@ pub mod drtio {
} }
} }
fn process_aux_errors(linkno: u8) { fn process_aux_errors(io: &Io, linkno: u8) {
drtioaux::send_link(linkno, &drtioaux::Packet::RtioErrorRequest).unwrap(); drtioaux::send_link(linkno, &drtioaux::Packet::RtioErrorRequest).unwrap();
match drtioaux::recv_timeout_link(linkno, None) { match recv_aux_timeout(io, linkno, 200) {
Ok(drtioaux::Packet::RtioNoErrorReply) => (), Ok(drtioaux::Packet::RtioNoErrorReply) => (),
Ok(drtioaux::Packet::RtioErrorSequenceErrorReply { channel }) => Ok(drtioaux::Packet::RtioErrorSequenceErrorReply { channel }) =>
error!("[LINK#{}] RTIO sequence error involving channel {}", linkno, channel), error!("[LINK#{}] RTIO sequence error involving channel {}", linkno, channel),
@ -204,7 +204,7 @@ pub mod drtio {
Ok(drtioaux::Packet::RtioErrorBusyReply { channel }) => Ok(drtioaux::Packet::RtioErrorBusyReply { channel }) =>
error!("[LINK#{}] RTIO busy error involving channel {}", linkno, channel), error!("[LINK#{}] RTIO busy error involving channel {}", linkno, channel),
Ok(_) => error!("[LINK#{}] received unexpected aux packet", linkno), Ok(_) => error!("[LINK#{}] received unexpected aux packet", linkno),
Err(e) => error!("[LINK#{}] aux packet error ({})", linkno, e) Err(e) => error!("[LINK#{}] communication failed ({})", linkno, e)
} }
} }
@ -216,7 +216,7 @@ pub mod drtio {
/* link was previously up */ /* link was previously up */
if link_rx_up(linkno) { if link_rx_up(linkno) {
process_local_errors(linkno); process_local_errors(linkno);
process_aux_errors(linkno); process_aux_errors(&io, linkno);
} else { } else {
info!("[LINK#{}] link is down", linkno); info!("[LINK#{}] link is down", linkno);
set_link_up(linkno, false); set_link_up(linkno, false);