From c1fe20c06bde222a000ce54f9a00e5dcf2c406f8 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Fri, 26 Mar 2021 12:41:15 +0800 Subject: [PATCH] services: allow for multiple callbacks This means we can have multiple clients requesting a callback. Signed-off-by: Sean Cross --- services/rkyv-test-server/src/main.rs | 45 +++++++++++++++++++++------ 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/services/rkyv-test-server/src/main.rs b/services/rkyv-test-server/src/main.rs index c9801cd4c..88bf2048e 100644 --- a/services/rkyv-test-server/src/main.rs +++ b/services/rkyv-test-server/src/main.rs @@ -77,8 +77,16 @@ fn handle_log_string(mem: &xous::MemoryMessage) { fn double_string(mem: &mut xous::MemoryMessage) { use core::fmt::Write; let mut buffer = unsafe { buffer::Buffer::from_memory_message_mut(mem) }; - let mut response = api::StringDoubler { value: xous::String::new() }; - for ch in buffer.try_into::().unwrap().value.as_str().chars() { + let mut response = api::StringDoubler { + value: xous::String::new(), + }; + for ch in buffer + .try_into::() + .unwrap() + .value + .as_str() + .chars() + { write!(response.value, "{}{}", ch, ch).ok(); } buffer.serialize_from(response).unwrap(); @@ -86,7 +94,6 @@ fn double_string(mem: &mut xous::MemoryMessage) { #[xous::xous_main] fn test_main() -> ! { - let mut callback_conn = None; log_server::init_wait().unwrap(); log::info!( @@ -95,6 +102,8 @@ fn test_main() -> ! { ); let sid = xous_names::register_name(api::SERVER_NAME).unwrap(); + let mut logstring_callback_connections = [None; 32]; + loop { let mut msg = xous::receive_message(sid).unwrap(); match FromPrimitive::from_usize(msg.body.id()) { @@ -106,15 +115,23 @@ fn test_main() -> ! { } Some(api::Opcode::LogString) => { let memory = msg.body.memory_message().unwrap(); - if let Some(callback_sid) = callback_conn { - let buffer = unsafe { buffer::Buffer::from_memory_message(memory) }; - buffer - .lend(callback_sid, api::CallbackType::LogString.to_u32().unwrap()) - .unwrap(); + // If a callback exists, first pass this message to the callback server. + for callback_conn in logstring_callback_connections.iter() { + if let Some(callback_sid) = callback_conn { + let buffer = unsafe { buffer::Buffer::from_memory_message(memory) }; + buffer + .lend( + *callback_sid, + api::CallbackType::LogString.to_u32().unwrap(), + ) + .unwrap(); + } } handle_log_string(msg.body.memory_message().unwrap()) } Some(api::Opcode::AddLogStringCallback) => { + // The Log String Callback provides us a SID. Connect to that SID + // and add it to the list of connections available. if let xous::Message::Scalar(xous::ScalarMessage { id: _id, arg1, @@ -124,7 +141,17 @@ fn test_main() -> ! { }) = msg.body { let sid = xous::SID::from_u32(arg1 as _, arg2 as _, arg3 as _, arg4 as _); - callback_conn = Some(xous::connect(sid).unwrap()); + let cb_conn = Some(xous::connect(sid).unwrap()); + // Add this callback connection to the list of callbacks if it doesn't + // already exist. + if !logstring_callback_connections.contains(&cb_conn) { + for entry in logstring_callback_connections.iter_mut() { + if *entry == None { + *entry = cb_conn; + break; + } + } + } } } None => (),