occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

firmware: Make "unexpected reply from kernel CPU" log messages unique 

This makes it easier to localize issues based on the log output.
This commit is contained in:
David Nadlinger 2019-03-31 18:31:56 +01:00 committed by Sebastien Bourdeauducq
parent 3e49da3d39
commit 8b69babe8a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artiq/firmware/runtime/session.rs
View File

@ -223,7 +223,7 @@ unsafe fn kern_load(io: &Io, session: &mut Session, library: &[u8])
Err(Error::Load(format!("{}", error))) Err(Error::Load(format!("{}", error)))
} }
other => other =>
unexpected!("unexpected reply from kernel CPU: {:?}", other) unexpected!("unexpected kernel CPU reply to load request: {:?}", other)
} }
}) })
} }
@ -274,7 +274,8 @@ fn process_host_message(io: &Io,
let slot = kern_recv(io, |reply| { let slot = kern_recv(io, |reply| {
match reply { match reply {
&kern::RpcRecvRequest(slot) => Ok(slot), &kern::RpcRecvRequest(slot) => Ok(slot),
other => unexpected!("unexpected reply from kernel CPU: {:?}", other) other => unexpected!(
"expected root value slot from kernel CPU, not {:?}", other)
} }
})?; })?;
rpc::recv_return(stream, &tag, slot, &|size| -> Result<_, Error<SchedError>> { rpc::recv_return(stream, &tag, slot, &|size| -> Result<_, Error<SchedError>> {
@ -282,7 +283,8 @@ fn process_host_message(io: &Io,
Ok(kern_recv(io, |reply| { Ok(kern_recv(io, |reply| {
match reply { match reply {
&kern::RpcRecvRequest(slot) => Ok(slot), &kern::RpcRecvRequest(slot) => Ok(slot),
other => unexpected!("unexpected reply from kernel CPU: {:?}", other) other => unexpected!(
"expected nested value slot from kernel CPU, not {:?}", other)
} }
})?) })?)
})?; })?;
@ -301,8 +303,8 @@ fn process_host_message(io: &Io,
kern_recv(io, |reply| { kern_recv(io, |reply| {
match reply { match reply {
&kern::RpcRecvRequest(_) => Ok(()), &kern::RpcRecvRequest(_) => Ok(()),
other => other => unexpected!(
unexpected!("unexpected reply from kernel CPU: {:?}", other) "expected (ignored) root value slot from kernel CPU, not {:?}", other)
} }
})?; })?;