M-Labs/artiq-zynq
10
1
Fork 19
Code Issues 12 Pull Requests 1 Releases Wiki Activity

fixup! session: send host any async errors detection if found

Browse Source
This commit is contained in:
Steve Fan 2021-12-06 15:23:34 +08:00
parent 851ed095df
commit 24747f09cd
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/src/comms.rs
View File

@ -224,7 +224,7 @@ async fn handle_run_kernel(stream: Option<&TcpStream>, control: &Rc<RefCell<kern
} }
} }
}, },
kernel::Message::KernelFinished { async_errors } => { kernel::Message::KernelFinished(async_errors) => {
if let Some(stream) = stream { if let Some(stream) = stream {
write_header(stream, Reply::KernelFinished).await?; write_header(stream, Reply::KernelFinished).await?;
write_i8(stream, async_errors as i8).await?; write_i8(stream, async_errors as i8).await?;

2
src/runtime/src/kernel/core1.rs
View File

@ -193,7 +193,7 @@ pub extern "C" fn main_core1() {
} }
info!("kernel finished"); info!("kernel finished");
let async_errors = unsafe { get_async_errors() }; let async_errors = unsafe { get_async_errors() };
core1_tx.send(Message::KernelFinished { async_errors }); core1_tx.send(Message::KernelFinished(async_errors));
} }
_ => error!("Core1 received unexpected message: {:?}", message), _ => error!("Core1 received unexpected message: {:?}", message),
} }

4
src/runtime/src/kernel/mod.rs
View File

@ -30,9 +30,7 @@ pub enum Message {
LoadCompleted, LoadCompleted,
LoadFailed, LoadFailed,
StartRequest, StartRequest,
KernelFinished { KernelFinished(u8),
async_errors: u8
},
KernelException(&'static eh_artiq::Exception<'static>, &'static [usize], u8), KernelException(&'static eh_artiq::Exception<'static>, &'static [usize], u8),
RpcSend { is_async: bool, data: Vec<u8> }, RpcSend { is_async: bool, data: Vec<u8> },
RpcRecvRequest(*mut ()), RpcRecvRequest(*mut ()),