mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
refactor main loop to use deferred responses
I think things could be compactified even further, but this is a first-step "merge the threads and break as few things as possible" pass. Would like to get @gsora's multi-line boxes merged into this new system before doing even more optimization.
This commit is contained in:
parent
360e50a8bb
commit
f720f3175c
4 changed files with 485 additions and 503 deletions
|
|
@ -89,7 +89,31 @@ pub(crate) enum Opcode {
|
||||||
/// close dynamic notification
|
/// close dynamic notification
|
||||||
CloseDynamicNotification,
|
CloseDynamicNotification,
|
||||||
|
|
||||||
|
/// used by libraries to get the mutex on the server
|
||||||
GetMutex,
|
GetMutex,
|
||||||
|
|
||||||
|
// these are used internally by the modals to handle intermediate state. Do not call from the outside.
|
||||||
|
// these were originally handled in a separate thread for deferred responses using busy-waits. They are
|
||||||
|
// now handled with deferred responses with makes code less complicated and less load on the CPU but
|
||||||
|
// it does expose some of the internal API mechanics to outside processes. This is fine for the modals
|
||||||
|
// box because it's a convenience routine used by "everyone"; password boxes are always handled within
|
||||||
|
// a given secured server so that the attack surface for these do not extend into the modals boundary.
|
||||||
|
InitiateOp,
|
||||||
|
DoUpdateProgress,
|
||||||
|
FinishProgress,
|
||||||
|
|
||||||
|
TextEntryReturn,
|
||||||
|
RadioReturn,
|
||||||
|
CheckBoxReturn,
|
||||||
|
NotificationReturn,
|
||||||
|
|
||||||
|
DoUpdateDynamicNotification,
|
||||||
|
DoCloseDynamicNotification,
|
||||||
|
|
||||||
|
ModalRedraw,
|
||||||
|
ModalKeypress,
|
||||||
|
ModalDrop,
|
||||||
|
Gutter,
|
||||||
|
|
||||||
Quit,
|
Quit,
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,10 +8,12 @@ use xous::{CID, SID, send_message, Message};
|
||||||
use num_traits::{ToPrimitive, FromPrimitive};
|
use num_traits::{ToPrimitive, FromPrimitive};
|
||||||
use xous_ipc::Buffer;
|
use xous_ipc::Buffer;
|
||||||
use std::thread;
|
use std::thread;
|
||||||
|
use core::cell::Cell;
|
||||||
|
|
||||||
pub struct Modals {
|
pub struct Modals {
|
||||||
conn: CID,
|
conn: CID,
|
||||||
token: [u32; 4],
|
token: [u32; 4],
|
||||||
|
have_lock: Cell::<bool>,
|
||||||
}
|
}
|
||||||
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> {
|
||||||
|
|
@ -23,6 +25,7 @@ impl Modals {
|
||||||
Ok(Modals {
|
Ok(Modals {
|
||||||
conn,
|
conn,
|
||||||
token,
|
token,
|
||||||
|
have_lock: Cell::new(false),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -78,6 +81,7 @@ impl Modals {
|
||||||
unsafe{xous::disconnect(cid).unwrap()}; // must disconnect before destroy to avoid the CID from hanging out in our outbound table which is limited to 32 entries
|
unsafe{xous::disconnect(cid).unwrap()}; // must disconnect before destroy to avoid the CID from hanging out in our outbound table which is limited to 32 entries
|
||||||
xous::destroy_server(SID::from_array(server)).expect("couldn't destroy temporary server");
|
xous::destroy_server(SID::from_array(server)).expect("couldn't destroy temporary server");
|
||||||
}
|
}
|
||||||
|
self.unlock();
|
||||||
match buf.to_original::<TextEntryPayload, _>() {
|
match buf.to_original::<TextEntryPayload, _>() {
|
||||||
Ok(response) => Ok(response),
|
Ok(response) => Ok(response),
|
||||||
_ => Err(xous::Error::InternalError)
|
_ => Err(xous::Error::InternalError)
|
||||||
|
|
@ -93,6 +97,7 @@ impl Modals {
|
||||||
};
|
};
|
||||||
let buf = Buffer::into_buf(spec).or(Err(xous::Error::InternalError))?;
|
let buf = Buffer::into_buf(spec).or(Err(xous::Error::InternalError))?;
|
||||||
buf.lend(self.conn, Opcode::Notification.to_u32().unwrap()).or(Err(xous::Error::InternalError))?;
|
buf.lend(self.conn, Opcode::Notification.to_u32().unwrap()).or(Err(xous::Error::InternalError))?;
|
||||||
|
self.unlock();
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -131,6 +136,7 @@ impl Modals {
|
||||||
self.token[3] as usize,
|
self.token[3] as usize,
|
||||||
)
|
)
|
||||||
).expect("couldn't stop progress");
|
).expect("couldn't stop progress");
|
||||||
|
self.unlock();
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -154,6 +160,7 @@ impl Modals {
|
||||||
let mut buf = Buffer::into_buf(spec).or(Err(xous::Error::InternalError))?;
|
let mut buf = Buffer::into_buf(spec).or(Err(xous::Error::InternalError))?;
|
||||||
buf.lend_mut(self.conn, Opcode::PromptWithFixedResponse.to_u32().unwrap()).or(Err(xous::Error::InternalError))?;
|
buf.lend_mut(self.conn, Opcode::PromptWithFixedResponse.to_u32().unwrap()).or(Err(xous::Error::InternalError))?;
|
||||||
let itemname = buf.to_original::<ItemName, _>().unwrap();
|
let itemname = buf.to_original::<ItemName, _>().unwrap();
|
||||||
|
self.unlock();
|
||||||
Ok(String::from(itemname.as_str()))
|
Ok(String::from(itemname.as_str()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -172,6 +179,7 @@ impl Modals {
|
||||||
ret.push(String::from(item.as_str()));
|
ret.push(String::from(item.as_str()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
self.unlock();
|
||||||
Ok(ret)
|
Ok(ret)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -197,7 +205,6 @@ impl Modals {
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
pub fn dynamic_notification_close(&self) -> Result<(), xous::Error> {
|
pub fn dynamic_notification_close(&self) -> Result<(), xous::Error> {
|
||||||
self.lock();
|
|
||||||
send_message(self.conn,
|
send_message(self.conn,
|
||||||
Message::new_scalar(Opcode::CloseDynamicNotification.to_usize().unwrap(),
|
Message::new_scalar(Opcode::CloseDynamicNotification.to_usize().unwrap(),
|
||||||
self.token[0] as usize,
|
self.token[0] as usize,
|
||||||
|
|
@ -206,28 +213,35 @@ impl Modals {
|
||||||
self.token[3] as usize,
|
self.token[3] as usize,
|
||||||
)
|
)
|
||||||
).expect("couldn't stop progress");
|
).expect("couldn't stop progress");
|
||||||
|
self.unlock();
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Blocks until we have a lock on the modals server
|
/// Blocks until we have a lock on the modals server
|
||||||
fn lock(&self) {
|
fn lock(&self) {
|
||||||
match send_message(
|
if !self.have_lock.get() {
|
||||||
self.conn,
|
match send_message(
|
||||||
Message::new_blocking_scalar(Opcode::GetMutex.to_usize().unwrap(),
|
self.conn,
|
||||||
self.token[0] as usize,
|
Message::new_blocking_scalar(Opcode::GetMutex.to_usize().unwrap(),
|
||||||
self.token[1] as usize,
|
self.token[0] as usize,
|
||||||
self.token[2] as usize,
|
self.token[1] as usize,
|
||||||
self.token[3] as usize,
|
self.token[2] as usize,
|
||||||
)).expect("couldn't send mutex acquisition message") {
|
self.token[3] as usize,
|
||||||
xous::Result::Scalar1(code) => {
|
)).expect("couldn't send mutex acquisition message") {
|
||||||
if code != 1 {
|
xous::Result::Scalar1(code) => {
|
||||||
log::warn!("Unexpected return from lock acquisition.");
|
if code != 1 {
|
||||||
|
log::warn!("Unexpected return from lock acquisition.");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
_ => {
|
||||||
|
log::error!("Internal error trying to acquire mutex");
|
||||||
}
|
}
|
||||||
},
|
|
||||||
_ => {
|
|
||||||
log::error!("Internal error trying to acquire mutex");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
self.have_lock.set(true);
|
||||||
|
}
|
||||||
|
fn unlock(&self) {
|
||||||
|
self.have_lock.set(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -38,7 +38,7 @@ pub(crate) fn spawn_test() {
|
||||||
// The start and end items are deliberately structured to be not zero-indexed; the use of PDDB_LOC is just a
|
// The start and end items are deliberately structured to be not zero-indexed; the use of PDDB_LOC is just a
|
||||||
// convenient global constant.
|
// convenient global constant.
|
||||||
modals.start_progress("Progress Quest", xous::PDDB_LOC, xous::PDDB_LOC + 64*1024*128, xous::PDDB_LOC).expect("couldn't raise progress bar");
|
modals.start_progress("Progress Quest", xous::PDDB_LOC, xous::PDDB_LOC + 64*1024*128, xous::PDDB_LOC).expect("couldn't raise progress bar");
|
||||||
for i in (xous::PDDB_LOC..xous::PDDB_LOC + 64*1024*128).step_by(64*1024) {
|
for i in (xous::PDDB_LOC..xous::PDDB_LOC + 64*1024*128).step_by(64*1024*16) {
|
||||||
modals.update_progress(i).expect("couldn't update progress bar");
|
modals.update_progress(i).expect("couldn't update progress bar");
|
||||||
tt.sleep_ms(100).unwrap();
|
tt.sleep_ms(100).unwrap();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue