saymrwulf/xous-core
1
0
Fork 0
mirror of https://github.com/saymrwulf/xous-core.git synced 2026-11-08 04:56:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kernel: don't block on full queue for Scalar/Move msgs

Browse source 
For Scalar and Move messages, the client does not need to block if the
server does not have any waiting messages. In this case, send an `Ok`
response.

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2020-07-16 10:16:42 +08:00
parent 506d01fe4a
commit ba7bb29ce2
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
kernel/src/syscall.rs
View file

@ -465,9 +465,7 @@ pub fn handle(pid: PID, call: SysCall) -> core::result::Result<xous::Result, xou
ctx_number,
xous::Result::Message(envelope),
)
.and_then(|_| {
ss.switch_from(pid, context_nr, false)
})
.and_then(|_| ss.switch_from(pid, context_nr, false))
.map(|_| xous::Result::BlockedProcess)
} else if cfg!(baremetal) {
// println!("Setting the return value of the Server and returning to Client");
@ -501,17 +499,19 @@ pub fn handle(pid: PID, call: SysCall) -> core::result::Result<xous::Result, xou
// Park this context if it's blocking. This is roughly
// equivalent to a "Yield".
if !cfg!(baremetal) {
ss.switch_from(pid, context_nr, false)?;
Ok(xous::Result::BlockedProcess)
} else if blocking {
// println!("Returning to parent");
let process = ss.get_process(pid).expect("Can't get current process");
let ppid = process.ppid;
unsafe { SWITCHTO_CALLER = None };
ss.activate_process_context(ppid, 0, !blocking, blocking)
.map(|_| Ok(xous::Result::ResumeProcess))
.unwrap_or(Err(xous::Error::ProcessNotFound))
if blocking {
if !cfg!(baremetal) {
ss.switch_from(pid, context_nr, false)?;
Ok(xous::Result::BlockedProcess)
} else {
// println!("Returning to parent");
let process = ss.get_process(pid).expect("Can't get current process");
let ppid = process.ppid;
unsafe { SWITCHTO_CALLER = None };
ss.activate_process_context(ppid, 0, !blocking, blocking)
.map(|_| Ok(xous::Result::ResumeProcess))
.unwrap_or(Err(xous::Error::ProcessNotFound))
}
} else {
// println!("Returning to Client with Ok result");
Ok(xous::Result::Ok)