refactor locking to use deferred responses

This commit is contained in:
bunnie 2022-04-07 02:19:37 +08:00
parent 1261d73451
commit 360e50a8bb
2 changed files with 22 additions and 22 deletions

View file

@ -12,7 +12,6 @@ use std::thread;
pub struct Modals { pub struct Modals {
conn: CID, conn: CID,
token: [u32; 4], token: [u32; 4],
tt: ticktimer_server::Ticktimer,
} }
impl Modals { impl Modals {
pub fn new(xns: &xous_names::XousNames) -> Result<Self, xous::Error> { pub fn new(xns: &xous_names::XousNames) -> Result<Self, xous::Error> {
@ -24,7 +23,6 @@ impl Modals {
Ok(Modals { Ok(Modals {
conn, conn,
token, token,
tt: ticktimer_server::Ticktimer::new().unwrap(),
}) })
} }
@ -211,14 +209,8 @@ impl Modals {
Ok(()) Ok(())
} }
/// busy-wait until we have acquired a mutex on the Modals server /// Blocks until we have a lock on the modals server
fn lock(&self) { fn lock(&self) {
while !self.try_get_mutex() {
self.tt.sleep_ms(1000).unwrap();
}
}
fn try_get_mutex(&self) -> bool {
match send_message( match send_message(
self.conn, self.conn,
Message::new_blocking_scalar(Opcode::GetMutex.to_usize().unwrap(), Message::new_blocking_scalar(Opcode::GetMutex.to_usize().unwrap(),
@ -228,18 +220,14 @@ impl Modals {
self.token[3] as usize, self.token[3] as usize,
)).expect("couldn't send mutex acquisition message") { )).expect("couldn't send mutex acquisition message") {
xous::Result::Scalar1(code) => { xous::Result::Scalar1(code) => {
if code == 1 { if code != 1 {
true log::warn!("Unexpected return from lock acquisition.");
} else {
false
} }
}, },
_ => { _ => {
log::error!("Internal error trying to acquire mutex"); log::error!("Internal error trying to acquire mutex");
false
} }
} }
} }
} }

View file

@ -435,6 +435,8 @@ fn xmain() -> ! {
let default_nonce = [ let default_nonce = [
trng.get_u32().unwrap(), trng.get_u32().unwrap(), trng.get_u32().unwrap(), trng.get_u32().unwrap(), trng.get_u32().unwrap(), trng.get_u32().unwrap(), trng.get_u32().unwrap(), trng.get_u32().unwrap(),
]; ];
let mut work_queue = Vec::<(xous::MessageSender, [u32; 4])>::new();
loop { loop {
let mut msg = xous::receive_message(modals_sid).unwrap(); let mut msg = xous::receive_message(modals_sid).unwrap();
log::debug!("message: {:?}", msg); log::debug!("message: {:?}", msg);
@ -445,7 +447,7 @@ fn xmain() -> ! {
if token == incoming_token { if token == incoming_token {
xous::return_scalar(msg.sender, 1).unwrap(); xous::return_scalar(msg.sender, 1).unwrap();
} else { } else {
xous::return_scalar(msg.sender, 0).unwrap(); work_queue.push((msg.sender, incoming_token));
} }
} else { } else {
token_lock = Some(incoming_token); token_lock = Some(incoming_token);
@ -470,7 +472,7 @@ fn xmain() -> ! {
RendererState::RunRadio(_) => (), RendererState::RunRadio(_) => (),
RendererState::ResponseRadio(item) => { RendererState::ResponseRadio(item) => {
buffer.replace(item).unwrap(); buffer.replace(item).unwrap();
token_lock = None; token_lock = next_lock(&mut work_queue);
break; break;
}, },
_ => { _ => {
@ -499,7 +501,7 @@ fn xmain() -> ! {
RendererState::RunCheckBox(_) => (), RendererState::RunCheckBox(_) => (),
RendererState::ResponseCheckBox(items) => { RendererState::ResponseCheckBox(items) => {
buffer.replace(items).unwrap(); buffer.replace(items).unwrap();
token_lock = None; token_lock = next_lock(&mut work_queue);
break; break;
}, },
_ => { _ => {
@ -528,7 +530,7 @@ fn xmain() -> ! {
RendererState::RunText(_) => (), RendererState::RunText(_) => (),
RendererState::ResponseText(text) => { RendererState::ResponseText(text) => {
buffer.replace(text).unwrap(); buffer.replace(text).unwrap();
token_lock = None; token_lock = next_lock(&mut work_queue);
break; break;
}, },
_ => { _ => {
@ -554,7 +556,7 @@ fn xmain() -> ! {
loop { loop {
match *op.lock().unwrap() { match *op.lock().unwrap() {
RendererState::RunNotification(_) => (), RendererState::RunNotification(_) => (),
RendererState::None => {token_lock = None; break}, RendererState::None => {token_lock = next_lock(&mut work_queue); break},
_ => { _ => {
log::error!("Illegal state transition in renderer"); log::error!("Illegal state transition in renderer");
panic!("Illegal state transition in renderer"); panic!("Illegal state transition in renderer");
@ -592,7 +594,7 @@ fn xmain() -> ! {
renderer_cid, renderer_cid,
Message::new_scalar(RendererOp::FinishProgress.to_usize().unwrap(), 0, 0, 0, 0) Message::new_scalar(RendererOp::FinishProgress.to_usize().unwrap(), 0, 0, 0, 0)
).expect("couldn't update progress bar"); ).expect("couldn't update progress bar");
token_lock = None; token_lock = next_lock(&mut work_queue);
}), }),
Some(Opcode::AddModalItem) => { Some(Opcode::AddModalItem) => {
let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) };
@ -640,7 +642,7 @@ fn xmain() -> ! {
renderer_cid, renderer_cid,
Message::new_scalar(RendererOp::CloseDynamicNotification.to_usize().unwrap(), 0, 0, 0, 0) Message::new_scalar(RendererOp::CloseDynamicNotification.to_usize().unwrap(), 0, 0, 0, 0)
).expect("couldn't close dynamic notification"); ).expect("couldn't close dynamic notification");
token_lock = None; token_lock = next_lock(&mut work_queue);
}), }),
Some(Opcode::Quit) => { Some(Opcode::Quit) => {
log::warn!("Shared modal UX handler exiting."); log::warn!("Shared modal UX handler exiting.");
@ -677,3 +679,13 @@ fn compute_checked_percentage(current: u32, start: u32, end: u32) -> u32 {
} }
} }
} }
fn next_lock(work_queue: &mut Vec::<(xous::MessageSender, [u32; 4])>) -> Option<[u32; 4]> {
if work_queue.len() > 0 {
let (unblock_pid, token) = work_queue.remove(0);
xous::return_scalar(unblock_pid, 1).unwrap();
Some(token)
} else {
None
}
}