convert enums into named struct per @xobs suggestion

This commit is contained in:
bunnie 2025-07-29 17:23:08 +08:00
parent 126896bf54
commit c151688822
2 changed files with 27 additions and 13 deletions

View file

@ -68,10 +68,16 @@ pub struct SystemServices {
pub enum PostActivateOp<'a> {
None,
// (result)
SetThreadResult(xous_kernel::Result),
// (sidx, current_pid, current_thread, message, client_address)
RememberServerMessage(usize, PID, TID, &'a Message, Option<MemoryAddress>),
SetThreadResult {
result: xous_kernel::Result,
},
RememberServerMessage {
sidx: usize,
current_pid: PID,
current_thread: TID,
message: &'a Message,
client_address: Option<MemoryAddress>,
},
}
#[derive(Copy, Clone, PartialEq)]
@ -1162,13 +1168,13 @@ impl SystemServices {
// log_process_update(file!(), line!(), new, old_state);
new.activate()?;
match lazy_arg {
PostActivateOp::RememberServerMessage(
PostActivateOp::RememberServerMessage {
sidx,
current_pid,
current_thread,
message,
client_address,
) => {
} => {
let si = {
let server =
self.server_from_sidx_mut(sidx).expect("couldn't re-discover server index");
@ -1176,7 +1182,7 @@ impl SystemServices {
};
sender_idx = Some(si);
}
PostActivateOp::SetThreadResult(result) => {
PostActivateOp::SetThreadResult { result } => {
let mut arch_process = ArchProcess::current();
arch_process.set_thread_result(new_tid, result);
}
@ -1238,13 +1244,13 @@ impl SystemServices {
// );
} else {
match lazy_arg {
PostActivateOp::RememberServerMessage(
PostActivateOp::RememberServerMessage {
sidx,
current_pid,
current_thread,
message,
client_address,
) => {
} => {
let si = {
let server =
self.server_from_sidx_mut(sidx).expect("couldn't re-discover server index");
@ -1252,7 +1258,7 @@ impl SystemServices {
};
sender_idx = Some(si);
}
PostActivateOp::SetThreadResult(result) => {
PostActivateOp::SetThreadResult { result } => {
ArchProcess::current().set_thread_result(new_tid, result);
}
_ => (),

View file

@ -206,7 +206,9 @@ fn send_message(pid: PID, tid: TID, cid: CID, message: Message) -> SysCallResult
ppid,
ptid,
false,
PostActivateOp::SetThreadResult(xous_kernel::Result::MessageEnvelope(envelope)),
PostActivateOp::SetThreadResult {
result: xous_kernel::Result::MessageEnvelope(envelope),
},
)
.map(|_| Ok(xous_kernel::Result::ResumeProcess))
.unwrap_or(Err(xous_kernel::Error::ProcessNotFound));
@ -229,7 +231,13 @@ fn send_message(pid: PID, tid: TID, cid: CID, message: Message) -> SysCallResult
server_pid,
server_tid,
false,
PostActivateOp::RememberServerMessage(sidx, pid, tid, &message, client_address),
PostActivateOp::RememberServerMessage {
sidx,
current_pid: pid,
current_thread: tid,
message: &message,
client_address,
},
) {
Ok(sender_idx) => {
let sender = SenderID::new(sidx, sender_idx, Some(pid));
@ -625,7 +633,7 @@ fn reply_and_receive_next(
response.pid,
response.tid,
false,
crate::services::PostActivateOp::SetThreadResult(response.result),
crate::services::PostActivateOp::SetThreadResult { result: response.result },
)
.map(|_| Ok(xous_kernel::Result::ResumeProcess))
.unwrap_or(Err(xous_kernel::Error::ProcessNotFound))