ticktimer-server: prepare for using ReplyAndReceiveNext

Misc cleanup prior to switching which call we use.

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2022-07-06 15:57:10 +08:00
parent be56af6303
commit 49ce85f9a8
2 changed files with 23 additions and 22 deletions

View file

@ -1,4 +1,5 @@
/// Do not modify the discriminants in this structure. They are used in `libstd` directly. /// Do not modify the discriminants in this structure. They are used in `libstd` directly.
#[repr(usize)]
#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)] #[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)]
pub enum Opcode { pub enum Opcode {
/// Get the elapsed time in milliseconds /// Get the elapsed time in milliseconds
@ -48,9 +49,12 @@ pub enum Opcode {
/// *arg1*: An integer of some sort, such as the address of the Condvar /// *arg1*: An integer of some sort, such as the address of the Condvar
/// *arg2*: The number of conditions to notify /// *arg2*: The number of conditions to notify
NotifyCondition = 9, NotifyCondition = 9,
/// Invalid call -- an error occurred decoding the opcode
InvalidCall = u32::MAX as usize,
} }
#[derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)] #[derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)]
pub struct VersionString { pub struct VersionString {
pub version: xous_ipc::String::<512>, pub version: xous_ipc::String<512>,
} }

View file

@ -606,8 +606,10 @@ fn main() -> ! {
let mut msg = xous::receive_message(ticktimer_server).unwrap(); let mut msg = xous::receive_message(ticktimer_server).unwrap();
log::trace!("msg: {:x?}", msg); log::trace!("msg: {:x?}", msg);
match num_traits::FromPrimitive::from_usize(msg.body.id()) { match num_traits::FromPrimitive::from_usize(msg.body.id())
Some(api::Opcode::ElapsedMs) => { .unwrap_or(api::Opcode::InvalidCall)
{
api::Opcode::ElapsedMs => {
let time = ticktimer.elapsed_ms() as i64; let time = ticktimer.elapsed_ms() as i64;
xous::return_scalar2( xous::return_scalar2(
msg.sender, msg.sender,
@ -616,7 +618,7 @@ fn main() -> ! {
) )
.expect("couldn't return time request"); .expect("couldn't return time request");
} }
Some(api::Opcode::SleepMs) => xous::msg_blocking_scalar_unpack!(msg, ms, _, _, _, { api::Opcode::SleepMs => xous::msg_blocking_scalar_unpack!(msg, ms, _, _, _, {
// let timeout_queue = timeout_heap.entry(msg.sender.pid()).or_default(); // let timeout_queue = timeout_heap.entry(msg.sender.pid()).or_default();
recalculate_sleep( recalculate_sleep(
&mut ticktimer, &mut ticktimer,
@ -629,7 +631,7 @@ fn main() -> ! {
}), }),
) )
}), }),
Some(api::Opcode::RecalculateSleep) => { api::Opcode::RecalculateSleep => {
// let timeout_queue = timeout_heap.entry(msg.sender.pid()).or_default(); // let timeout_queue = timeout_heap.entry(msg.sender.pid()).or_default();
if let Some(args) = msg.body.scalar_message() { if let Some(args) = msg.body.scalar_message() {
// If this is a Timeout message that fired, remove it from the Notification list // If this is a Timeout message that fired, remove it from the Notification list
@ -643,7 +645,8 @@ fn main() -> ! {
// the first check confirms that the origin of the RecalculateSleep message is the Ticktimer, // the first check confirms that the origin of the RecalculateSleep message is the Ticktimer,
// to prevent third-party servers from issuing the command and thus distorting the sleep // to prevent third-party servers from issuing the command and thus distorting the sleep
// calculations (since this is a public API, anything could happen). // calculations (since this is a public API, anything could happen).
if (msg.sender.pid().map(|p| p.get()).unwrap_or_default() as u32) == xous::process::id() if (msg.sender.pid().map(|p| p.get()).unwrap_or_default() as u32)
== xous::process::id()
&& (request_kind == RequestKind::Timeout as usize) && (request_kind == RequestKind::Timeout as usize)
&& (sender > 0) && (sender > 0)
{ {
@ -667,17 +670,17 @@ fn main() -> ! {
} }
recalculate_sleep(&mut ticktimer, &mut sleep_heap, None); recalculate_sleep(&mut ticktimer, &mut sleep_heap, None);
} }
Some(api::Opcode::SuspendResume) => xous::msg_scalar_unpack!(msg, token, _, _, _, { api::Opcode::SuspendResume => xous::msg_scalar_unpack!(msg, token, _, _, _, {
ticktimer.suspend(); ticktimer.suspend();
susres susres
.suspend_until_resume(token) .suspend_until_resume(token)
.expect("couldn't execute suspend/resume"); .expect("couldn't execute suspend/resume");
ticktimer.resume(); ticktimer.resume();
}), }),
Some(api::Opcode::PingWdt) => { api::Opcode::PingWdt => {
ticktimer.reset_wdt(); ticktimer.reset_wdt();
} }
Some(api::Opcode::GetVersion) => { api::Opcode::GetVersion => {
let mut buf = unsafe { let mut buf = unsafe {
xous_ipc::Buffer::from_memory_message_mut( xous_ipc::Buffer::from_memory_message_mut(
msg.body.memory_message_mut().unwrap(), msg.body.memory_message_mut().unwrap(),
@ -693,7 +696,7 @@ fn main() -> ! {
buf.replace(v).unwrap(); buf.replace(v).unwrap();
} }
} }
Some(api::Opcode::LockMutex) => { api::Opcode::LockMutex => {
let pid = msg.sender.pid(); let pid = msg.sender.pid();
if !msg.body.is_blocking() { if !msg.body.is_blocking() {
info!("sender made LockMutex request that was not blocking"); info!("sender made LockMutex request that was not blocking");
@ -718,7 +721,7 @@ fn main() -> ! {
mutex_entry.push_back(msg.sender); mutex_entry.push_back(msg.sender);
} }
} }
Some(api::Opcode::UnlockMutex) => { api::Opcode::UnlockMutex => {
let pid = msg.sender.pid(); let pid = msg.sender.pid();
if msg.body.is_blocking() { if msg.body.is_blocking() {
info!("sender made UnlockMutex request that was blocking"); info!("sender made UnlockMutex request that was blocking");
@ -740,7 +743,7 @@ fn main() -> ! {
} }
} }
} }
Some(api::Opcode::WaitForCondition) => { api::Opcode::WaitForCondition => {
let pid = msg.sender.pid(); let pid = msg.sender.pid();
if !msg.body.is_blocking() { if !msg.body.is_blocking() {
info!("sender made WaitForCondition request that was not blocking"); info!("sender made WaitForCondition request that was not blocking");
@ -802,7 +805,7 @@ fn main() -> ! {
); );
} }
} }
Some(api::Opcode::NotifyCondition) => { api::Opcode::NotifyCondition => {
let pid = msg.sender.pid(); let pid = msg.sender.pid();
if msg.body.is_blocking() { if msg.body.is_blocking() {
info!("sender made NotifyCondition request that was blocking"); info!("sender made NotifyCondition request that was blocking");
@ -831,13 +834,7 @@ fn main() -> ! {
stop_sleep(&mut ticktimer, &mut sleep_heap); stop_sleep(&mut ticktimer, &mut sleep_heap);
for entry in awaiting.drain(..available_count) { for entry in awaiting.drain(..available_count) {
// Remove each entry in the timeout set // Remove each entry in the timeout set
sleep_heap.retain(|_, v| { sleep_heap.retain(|_, v| if v.sender == entry { false } else { true });
if v.sender == entry {
false
} else {
true
}
});
xous::return_scalar(entry, 0).expect("couldn't send response"); xous::return_scalar(entry, 0).expect("couldn't send response");
} }
@ -865,7 +862,7 @@ fn main() -> ! {
); );
} }
} }
None => { api::Opcode::InvalidCall => {
error!("couldn't convert opcode"); error!("couldn't convert opcode");
} }
} }