good progress on restart_idle

src/runtime/src/comms.rs

@@ -4,9 +4,7 @@ use core::{cell::RefCell, fmt, slice, str};
 use core_io::Error as IoError;
 use cslice::CSlice;
 use dyld::elf;
-use futures::{future::FutureExt, select_biased};
-#[cfg(has_drtio)]
-use io::Cursor;
+use futures::{future::FutureExt, select_biased}; #[cfg(has_drtio)] use io::Cursor;
 #[cfg(has_drtio)]
 use ksupport::rpc;
 use ksupport::{kernel, resolve_channel_name};
@@ -803,70 +801,63 @@ pub fn main(timer: GlobalTimer, cfg: Config) {
             error!("Error loading startup kernel!");
         }
     }
-
-    mgmt::start(cfg);
+    let cfg = Rc::new(cfg);
+    let restart_idle = Rc::new(Semaphore::new(0, 1));
+    mgmt::start(cfg.clone(), restart_idle.clone());
+    
+    let terminate = Rc::new(Semaphore::new(0, 1));
+    let connection = Rc::new(Semaphore::new(1, 1));
+    let finish = Rc::new(Semaphore::new(1, 1));
+    let start = Rc::new(Semaphore::new(1, 1)); // run idle kernel once without needing restart
+    // turn the above into a control obj
+    //
+    let stream_refcell = Rc::new(RefCell::new(None));
 
     task::spawn(async move {
-        let connection = Rc::new(Semaphore::new(0, 1));
-        let terminate = Rc::new(Semaphore::new(0, 1));
-        {
-            let control = control.clone();
-            let idle_kernel = idle_kernel.clone();
-            let connection = connection.clone();
-            let terminate = terminate.clone();
-            let up_destinations = up_destinations.clone();
-            let aux_mutex = aux_mutex.clone();
-            let routing_table = drtio_routing_table.clone();
-            task::spawn(async move {
-                let routing_table = routing_table.borrow();
-                select_biased! {
-                    _ = (async {
-                        if let Some(buffer) = &*idle_kernel {
-                            load_and_run_idle_kernel(&buffer, &control, &up_destinations, &aux_mutex, &routing_table, timer).await;
-                        }
-                    }).fuse() => (),
-                    _ = terminate.async_wait().fuse() => ()
-                }
-                connection.signal();
-            });
-        }
-
         loop {
-            let mut stream = TcpStream::accept(1381, 0x10_000, 0x10_000).await.unwrap();
-
-            if connection.try_wait().is_none() {
-                // there is an existing connection
-                terminate.signal();
-                connection.async_wait().await;
-            }
-
-            let control = control.clone();
-            let idle_kernel = idle_kernel.clone();
-            let connection = connection.clone();
-            let terminate = terminate.clone();
-            let up_destinations = up_destinations.clone();
-            let aux_mutex = aux_mutex.clone();
-            let routing_table = drtio_routing_table.clone();
-
-            // we make sure the value of terminate is 0 before we start
-            let _ = terminate.try_wait();
-            task::spawn(async move {
-                let routing_table = routing_table.borrow();
-                select_biased! {
-                    _ = (async {
+            clone_mult!(semaphores, control, up_destinations, aux_mutex, routing_table);
+            start.async_wait().await;
+            let stream_opt = stream_refcell.borrow_mut();
+            let _ = connection.try_wait();
+            let _ = finish.try_wait();
+            select_biased! {
+                _ = (async {
+                    if let Some(&mut stream) = stream_opt {
                         let _ = handle_connection(&mut stream, control.clone(), &up_destinations, &aux_mutex, &routing_table, timer)
                             .await
                             .map_err(|e| warn!("connection terminated: {}", e));
-                        if let Some(buffer) = &*idle_kernel {
-                            load_and_run_idle_kernel(&buffer, &control, &up_destinations, &aux_mutex, &routing_table, timer).await;
-                        }
-                    }).fuse() => (),
-                    _ = terminate.async_wait().fuse() => ()
-                }
-                connection.signal();
-                let _ = stream.flush().await;
-                let _ = stream.abort().await;
-            });
+                    }
+                    connection.signal();
+                    if let Some(buffer) = cfg.read("idle_kernel").ok() {
+                        load_and_run_idle_kernel(&buffer, &control, &up_destinations, &aux_mutex, &routing_table, timer).await;
+                    }
+                }).fuse() => (), // TODO: on clean exit with existing idle -> run again?
+                _ = terminate.async_wait().fuse() => (),
+            }
+            if let Some(&stream) = stream_opt {
+                stream.flush().await();
+                stream.abort().await();
+            }
+            finish.signal();
+        }
+    });
+
+    task::spawn(async move {
+        loop {
+            clone_mult!(semaphores, stream_refcell);
+            let stream_opt = select_biased! {
+                temp_s = (async {
+                       Some(Rc::new(TcpStream::accept(1381, 0x10_000, 0x10_000).await.unwrap()))
+                    }).fuse() => temp_s,
+                _ = (async {
+                        restart_idle.async_wait().await;
+                        connection.async_wait().await;
+                    }).fuse() => None
+            };
+            terminate.signal();
+            finish.async_wait().await;
+            stream_refcell.replace(stream_opt);
+            start.signal();
         }
     });
 
@@ -913,8 +904,9 @@ pub fn soft_panic_main(timer: GlobalTimer, cfg: Config) -> ! {
     };
 
     Sockets::init(32);
-
-    mgmt::start(cfg);
+    
+    let dummy_restart = Rc::new(Semaphore::new(0, 1));
+    mgmt::start(Rc::new(cfg), dummy_restart);
 
     // getting eth settings disables the LED as it resets GPIO
     // need to re-enable it here
@@ -926,3 +918,15 @@ pub fn soft_panic_main(timer: GlobalTimer, cfg: Config) -> ! {
 
     Sockets::run(&mut iface, || Instant::from_millis(timer.get_time().0 as i32));
 }
+
+macro_rules! clone_mult {
+    ($id:ident) => {
+        let $id = $id.clone();
+    };
+
+    // Decompose multiple `eval`s recursively
+    ($id:ident, $($ids:ident),+) => {
+        clone_mult!($id)
+        clone_mult!($($ids),+)
+    };
+}

src/runtime/src/mgmt.rs

@@ -6,6 +6,7 @@ use libasync::{smoltcp::TcpStream, task};
 use libboard_artiq::logger::{BufferLogger, LogBufferRef};
 use libboard_zynq::{slcr, smoltcp};
 use libconfig::Config;
+use libcortex_a9::semaphore::Semaphore;
 use log::{self, debug, error, info, warn, LevelFilter};
 use num_derive::FromPrimitive;
 use num_traits::FromPrimitive;
@@ -111,7 +112,7 @@ async fn read_key(stream: &mut TcpStream) -> Result<String> {
     Ok(String::from_utf8(buffer).unwrap())
 }
 
-async fn handle_connection(stream: &mut TcpStream, pull_id: Rc<RefCell<u32>>, cfg: Rc<Config>) -> Result<()> {
+async fn handle_connection(stream: &mut TcpStream, pull_id: Rc<RefCell<u32>>, cfg: Rc<Config>, restart_idle: Rc<Semaphore>) -> Result<()> {
     if !expect(&stream, b"ARTIQ management\n").await? {
         return Err(Error::UnexpectedPattern);
     }
@@ -200,6 +201,10 @@ async fn handle_connection(stream: &mut TcpStream, pull_id: Rc<RefCell<u32>>, cf
                 let value = cfg.write(&key, buffer);
                 if value.is_ok() {
                     debug!("write success");
+                    if key == "idle_kernel" {
+                        restart_idle.1.async_wait().await?;
+                        restart_idle.0.signal();
+                    }
                     write_i8(stream, Reply::Success as i8).await?;
                 } else {
                     // this is an error because we do not expect write to fail
@@ -229,17 +234,17 @@ async fn handle_connection(stream: &mut TcpStream, pull_id: Rc<RefCell<u32>>, cf
     }
 }
 
-pub fn start(cfg: Config) {
+pub fn start(cfg: Rc<Config>, restart_idle: Rc<Semaphore>) {
     task::spawn(async move {
         let pull_id = Rc::new(RefCell::new(0u32));
-        let cfg = Rc::new(cfg);
         loop {
             let mut stream = TcpStream::accept(1380, 2048, 2048).await.unwrap();
             let pull_id = pull_id.clone();
+            let restart_idle = restart_idle.clone();
             let cfg = cfg.clone();
             task::spawn(async move {
                 info!("received connection");
-                let _ = handle_connection(&mut stream, pull_id, cfg)
+                let _ = handle_connection(&mut stream, pull_id, cfg, restart_idle)
                     .await
                     .map_err(|e| warn!("connection terminated: {:?}", e));
                 let _ = stream.flush().await;