From 960745ca61fe4fa81c95870134335930e59305e4 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sat, 19 Feb 2022 01:38:20 +0800 Subject: [PATCH] eliminate `static mut` unsafe pattern in callback function storage since xous 0.9.5, we've had a Box and we've had threads, so now we can put the callback in a Box and pass it to a thread, instead of relying on an `unsafe` work-around to get the callback function pointer into the thread's environment. --- services/llio/src/rtc_lib.rs | 80 +++++++++++++--------------------- services/shellchat/src/cmds.rs | 1 - 2 files changed, 31 insertions(+), 50 deletions(-) diff --git a/services/llio/src/rtc_lib.rs b/services/llio/src/rtc_lib.rs index 1f5f0c647..589eba223 100644 --- a/services/llio/src/rtc_lib.rs +++ b/services/llio/src/rtc_lib.rs @@ -4,12 +4,10 @@ use xous_ipc::Buffer; use num_traits::{ToPrimitive, FromPrimitive}; use crate::*; -#[derive(Debug)] pub struct Rtc { conn: CID, callback_sid: Option, } -static mut RTC_CB: Option = None; impl Rtc { pub fn new(xns: &xous_names::XousNames) -> Self { REFCOUNT.fetch_add(1, Ordering::Relaxed); @@ -24,8 +22,7 @@ impl Rtc { buf.lend(self.conn, RtcOpcode::SetDateTime.to_u32().unwrap()).map(|_| ()) } pub fn unhook_rtc_callback(&mut self) -> Result<(), xous::Error> { - unsafe{RTC_CB = None}; - if let Some(sid) = self.callback_sid { + if let Some(sid) = self.callback_sid.take() { let sid_tuple = sid.to_u32(); xous::send_message(self.conn, Message::new_scalar(RtcOpcode::UnregisterDateTimeCallback.to_usize().unwrap(), @@ -34,21 +31,39 @@ impl Rtc { } Ok(()) } - pub fn hook_rtc_callback(&mut self, cb: fn(DateTime)) -> Result<(), xous::Error> { + pub fn hook_rtc_callback(&mut self, cb: impl Fn(DateTime) + 'static + Send) -> Result<(), xous::Error> { log::trace!("hooking rtc callback"); - if unsafe{RTC_CB}.is_some() { + if self.callback_sid.is_some() { return Err(xous::Error::MemoryInUse) } - unsafe{RTC_CB = Some(cb)}; - let sid_tuple: (u32, u32, u32, u32); - if let Some(sid) = self.callback_sid { - sid_tuple = sid.to_u32(); - } else { - let sid = xous::create_server().expect("Couldn't create RTC callback server"); - self.callback_sid = Some(sid); - sid_tuple = sid.to_u32(); - xous::create_thread_4(rtc_cb_server, sid_tuple.0 as usize, sid_tuple.1 as usize, sid_tuple.2 as usize, sid_tuple.3 as usize).unwrap(); - } + let sid = xous::create_server().expect("Couldn't create RTC callback server"); + self.callback_sid = Some(sid); + let sid_tuple = sid.to_u32(); + std::thread::spawn({ + let sid = sid.clone(); + let rtc_cb = Box::new(cb); + move || { + loop { + let msg = xous::receive_message(sid).unwrap(); + log::trace!("rtc callback got msg: {:?}", msg); + match FromPrimitive::from_usize(msg.body.id()) { + Some(Return::ReturnDateTime) => { + let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; + let dt = buffer.to_original::().unwrap(); + rtc_cb.as_ref()(dt); + } + Some(Return::Drop) => { + break; + } + None => { + log::error!("got unrecognized message in rtc CB server, ignoring"); + } + } + } + log::trace!("rtc callback server exiting"); + xous::destroy_server(sid).expect("can't destroy my server on exit!"); } + }); + //xous::create_thread_4(rtc_cb_server, sid_tuple.0 as usize, sid_tuple.1 as usize, sid_tuple.2 as usize, sid_tuple.3 as usize).unwrap(); xous::send_message(self.conn, Message::new_scalar(RtcOpcode::RegisterDateTimeCallback.to_usize().unwrap(), sid_tuple.0 as usize, sid_tuple.1 as usize, sid_tuple.2 as usize, sid_tuple.3 as usize @@ -106,36 +121,3 @@ impl Drop for Rtc { } } } - -fn rtc_cb_server(sid0: usize, sid1: usize, sid2: usize, sid3: usize) { - let sid = xous::SID::from_u32(sid0 as u32, sid1 as u32, sid2 as u32, sid3 as u32); - log::trace!("rtc callback server started"); - loop { - let msg = xous::receive_message(sid).unwrap(); - log::trace!("rtc callback got msg: {:?}", msg); - match FromPrimitive::from_usize(msg.body.id()) { - Some(Return::ReturnDateTime) => { - let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; - let dt = buffer.to_original::().unwrap(); - unsafe { - if let Some(cb) = RTC_CB { - cb(dt) - } else { - // callback happened after we unregistered - // this is a race condition, but it's also a harmless side effect - // we handle it by just ignoring the message - continue; - } - } - } - Some(Return::Drop) => { - break; - } - None => { - log::error!("got unrecognized message in rtc CB server, ignoring"); - } - } - } - log::trace!("rtc callback server exiting"); - xous::destroy_server(sid).expect("can't destroy my server on exit!"); -} \ No newline at end of file diff --git a/services/shellchat/src/cmds.rs b/services/shellchat/src/cmds.rs index 235c57fc2..dd3ea59b9 100644 --- a/services/shellchat/src/cmds.rs +++ b/services/shellchat/src/cmds.rs @@ -39,7 +39,6 @@ macro_rules! cmd_api { use trng::*; /////////////////////////// Command shell integration -#[derive(Debug)] pub struct CommonEnv { llio: llio::Llio, i2c: llio::I2c,