kernel: syscall: use new is_blocking() call

This removes the need to manually specify whether a call is blocking.

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2020-09-22 22:14:03 +08:00
parent 43002b8627
commit 435612a370

View file

@ -34,9 +34,9 @@ fn send_message(pid: PID, thread: TID, cid: CID, message: Message) -> SysCallRes
// Translate memory messages from the client process to the server // Translate memory messages from the client process to the server
// process. Additionally, determine whether the call is blocking. If // process. Additionally, determine whether the call is blocking. If
// so, switch to the server context right away. // so, switch to the server context right away.
let (message, blocking) = match message { let blocking = message.is_blocking();
Message::Scalar(_) => (message, false), let message = match message {
Message::BlockingScalar(_) => (message, true), Message::Scalar(_) | Message::BlockingScalar(_) => message,
Message::Move(msg) => { Message::Move(msg) => {
let new_virt = ss.send_memory( let new_virt = ss.send_memory(
msg.buf.as_mut_ptr(), msg.buf.as_mut_ptr(),
@ -44,15 +44,12 @@ fn send_message(pid: PID, thread: TID, cid: CID, message: Message) -> SysCallRes
core::ptr::null_mut(), core::ptr::null_mut(),
msg.buf.len(), msg.buf.len(),
)?; )?;
(
Message::Move(MemoryMessage { Message::Move(MemoryMessage {
id: msg.id, id: msg.id,
buf: MemoryRange::new(new_virt as usize, msg.buf.len())?, buf: MemoryRange::new(new_virt as usize, msg.buf.len())?,
offset: msg.offset, offset: msg.offset,
valid: msg.valid, valid: msg.valid,
}), })
false,
)
} }
Message::MutableBorrow(msg) => { Message::MutableBorrow(msg) => {
let new_virt = ss.lend_memory( let new_virt = ss.lend_memory(
@ -62,15 +59,12 @@ fn send_message(pid: PID, thread: TID, cid: CID, message: Message) -> SysCallRes
msg.buf.len(), msg.buf.len(),
true, true,
)?; )?;
(
Message::MutableBorrow(MemoryMessage { Message::MutableBorrow(MemoryMessage {
id: msg.id, id: msg.id,
buf: MemoryRange::new(new_virt as usize, msg.buf.len())?, buf: MemoryRange::new(new_virt as usize, msg.buf.len())?,
offset: msg.offset, offset: msg.offset,
valid: msg.valid, valid: msg.valid,
}), })
true,
)
} }
Message::Borrow(msg) => { Message::Borrow(msg) => {
let new_virt = ss.lend_memory( let new_virt = ss.lend_memory(
@ -88,15 +82,12 @@ fn send_message(pid: PID, thread: TID, cid: CID, message: Message) -> SysCallRes
// new_virt as usize, // new_virt as usize,
// server_pid, // server_pid,
// ); // );
(
Message::Borrow(MemoryMessage { Message::Borrow(MemoryMessage {
id: msg.id, id: msg.id,
buf: MemoryRange::new(new_virt as usize, msg.buf.len())?, buf: MemoryRange::new(new_virt as usize, msg.buf.len())?,
offset: msg.offset, offset: msg.offset,
valid: msg.valid, valid: msg.valid,
}), })
true,
)
} }
}; };