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

WIP: read idle kernel config after experiment end #310

Closed
srenblad wants to merge 1 commits from srenblad/artiq-zynq:consistent_idle_kernel into master
pull from: srenblad/artiq-zynq:consistent_idle_kernel
merge into: M-Labs:master
Conversation 2 Commits 1 Files Changed 2 +11 -11
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ba3e38db11 - Show all commits

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

@ -777,7 +777,6 @@ pub fn main(timer: GlobalTimer, cfg: Config) {
moninj::start(timer, &aux_mutex, &drtio_routing_table); moninj::start(timer, &aux_mutex, &drtio_routing_table);
let control: Rc<RefCell<kernel::Control>> = Rc::new(RefCell::new(kernel::Control::start())); let control: Rc<RefCell<kernel::Control>> = Rc::new(RefCell::new(kernel::Control::start()));
let idle_kernel = Rc::new(cfg.read("idle_kernel").ok());
if let Ok(buffer) = cfg.read("startup_kernel") { if let Ok(buffer) = cfg.read("startup_kernel") {
info!("Loading startup kernel..."); info!("Loading startup kernel...");
let routing_table = drtio_routing_table.borrow(); let routing_table = drtio_routing_table.borrow();
@ -804,14 +803,15 @@ pub fn main(timer: GlobalTimer, cfg: Config) {
} }
} }
mgmt::start(cfg); let cfg: Rc<Config> = Rc::new(cfg);
srenblad marked this conversation as resolved
mwojcik commented 2024-08-06 18:48:29 +08:00
Review
Copy Link

Should Rc be passed to main() rather than created here?

Should Rc<Config> be passed to main() rather than created here?
srenblad commented 2024-08-07 10:32:03 +08:00
Review
Copy Link

This would also necessitate changing the signatures of rtio_mgt::startup and ksupport::setup_device_map (or borrow() into the calls). Additionally, should this be the case for soft_panic_main? Still, I am happy to change it, if you have a preference for it.

This would also necessitate changing the signatures of `rtio_mgt::startup` and `ksupport::setup_device_map` (or `borrow()` into the calls). Additionally, should this be the case for `soft_panic_main`? Still, I am happy to change it, if you have a preference for it.
mwojcik commented 2024-08-08 02:52:02 +08:00
Review
Copy Link

On second thought, this is unnecessary here, and this would be fine. I was thinking of RISC-V firmware that does this in that way. Here it wouldn't do much except add a bunch of unnecessary borrows.

On second thought, this is unnecessary here, and this would be fine. I was thinking of RISC-V firmware that does this in that way. Here it wouldn't do much except add a bunch of unnecessary borrows.
👍 1
mgmt::start(cfg.clone());
task::spawn(async move { task::spawn(async move {
let connection = Rc::new(Semaphore::new(0, 1)); let connection = Rc::new(Semaphore::new(0, 1));
let terminate = Rc::new(Semaphore::new(0, 1)); let terminate = Rc::new(Semaphore::new(0, 1));
{ {
let control = control.clone(); let control = control.clone();
let idle_kernel = idle_kernel.clone(); let cfg = cfg.clone();
let connection = connection.clone(); let connection = connection.clone();
let terminate = terminate.clone(); let terminate = terminate.clone();
let up_destinations = up_destinations.clone(); let up_destinations = up_destinations.clone();
@ -819,9 +819,10 @@ pub fn main(timer: GlobalTimer, cfg: Config) {
let routing_table = drtio_routing_table.clone(); let routing_table = drtio_routing_table.clone();
task::spawn(async move { task::spawn(async move {
let routing_table = routing_table.borrow(); let routing_table = routing_table.borrow();
let idle_kernel = cfg.read("idle_kernel").ok();
select_biased! { select_biased! {
_ = (async { _ = (async {
if let Some(buffer) = &*idle_kernel { if let Some(buffer) = &idle_kernel {
load_and_run_idle_kernel(&buffer, &control, &up_destinations, &aux_mutex, &routing_table, timer).await; load_and_run_idle_kernel(&buffer, &control, &up_destinations, &aux_mutex, &routing_table, timer).await;
} }
}).fuse() => (), }).fuse() => (),
@ -841,7 +842,7 @@ pub fn main(timer: GlobalTimer, cfg: Config) {
} }
let control = control.clone(); let control = control.clone();
let idle_kernel = idle_kernel.clone(); let cfg = cfg.clone();
let connection = connection.clone(); let connection = connection.clone();
let terminate = terminate.clone(); let terminate = terminate.clone();
let up_destinations = up_destinations.clone(); let up_destinations = up_destinations.clone();
@ -852,12 +853,13 @@ pub fn main(timer: GlobalTimer, cfg: Config) {
let _ = terminate.try_wait(); let _ = terminate.try_wait();
task::spawn(async move { task::spawn(async move {
let routing_table = routing_table.borrow(); let routing_table = routing_table.borrow();
let idle_kernel = cfg.read("idle_kernel").ok();
select_biased! { select_biased! {
_ = (async { _ = (async {
let _ = handle_connection(&mut stream, control.clone(), &up_destinations, &aux_mutex, &routing_table, timer) let _ = handle_connection(&mut stream, control.clone(), &up_destinations, &aux_mutex, &routing_table, timer)
.await .await
.map_err(|e| warn!("connection terminated: {}", e)); .map_err(|e| warn!("connection terminated: {}", e));
if let Some(buffer) = &*idle_kernel { if let Some(buffer) = &idle_kernel {
load_and_run_idle_kernel(&buffer, &control, &up_destinations, &aux_mutex, &routing_table, timer).await; load_and_run_idle_kernel(&buffer, &control, &up_destinations, &aux_mutex, &routing_table, timer).await;
} }
}).fuse() => (), }).fuse() => (),
@ -913,8 +915,7 @@ pub fn soft_panic_main(timer: GlobalTimer, cfg: Config) -> ! {
}; };
Sockets::init(32); Sockets::init(32);
mgmt::start(Rc::new(cfg));
mgmt::start(cfg);
// getting eth settings disables the LED as it resets GPIO // getting eth settings disables the LED as it resets GPIO
// need to re-enable it here // need to re-enable it here

3
src/runtime/src/mgmt.rs
View File

@ -229,10 +229,9 @@ async fn handle_connection(stream: &mut TcpStream, pull_id: Rc<RefCell<u32>>, cf
} }
} }
pub fn start(cfg: Config) { pub fn start(cfg: Rc<Config>) {
task::spawn(async move { task::spawn(async move {
let pull_id = Rc::new(RefCell::new(0u32)); let pull_id = Rc::new(RefCell::new(0u32));
let cfg = Rc::new(cfg);
loop { loop {
let mut stream = TcpStream::accept(1380, 2048, 2048).await.unwrap(); let mut stream = TcpStream::accept(1380, 2048, 2048).await.unwrap();
let pull_id = pull_id.clone(); let pull_id = pull_id.clone();