From 24747f09cd3de1f226f52d6d56f1c6ecca1cacba Mon Sep 17 00:00:00 2001 From: Steve Fan Date: Mon, 6 Dec 2021 15:23:34 +0800 Subject: [PATCH] fixup! session: send host any async errors detection if found --- src/runtime/src/comms.rs | 2 +- src/runtime/src/kernel/core1.rs | 2 +- src/runtime/src/kernel/mod.rs | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/runtime/src/comms.rs b/src/runtime/src/comms.rs index 00a2b6f..55cfc18 100644 --- a/src/runtime/src/comms.rs +++ b/src/runtime/src/comms.rs @@ -224,7 +224,7 @@ async fn handle_run_kernel(stream: Option<&TcpStream>, control: &Rc { + kernel::Message::KernelFinished(async_errors) => { if let Some(stream) = stream { write_header(stream, Reply::KernelFinished).await?; write_i8(stream, async_errors as i8).await?; diff --git a/src/runtime/src/kernel/core1.rs b/src/runtime/src/kernel/core1.rs index ab6a428..9084260 100644 --- a/src/runtime/src/kernel/core1.rs +++ b/src/runtime/src/kernel/core1.rs @@ -193,7 +193,7 @@ pub extern "C" fn main_core1() { } info!("kernel finished"); 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), } diff --git a/src/runtime/src/kernel/mod.rs b/src/runtime/src/kernel/mod.rs index 3ca8bf6..58bebf2 100644 --- a/src/runtime/src/kernel/mod.rs +++ b/src/runtime/src/kernel/mod.rs @@ -30,9 +30,7 @@ pub enum Message { LoadCompleted, LoadFailed, StartRequest, - KernelFinished { - async_errors: u8 - }, + KernelFinished(u8), KernelException(&'static eh_artiq::Exception<'static>, &'static [usize], u8), RpcSend { is_async: bool, data: Vec }, RpcRecvRequest(*mut ()),