mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-17 08:40:52 +00:00
services: implement basics of ReceiveMessage
Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
8b54ebff35
commit
33162a1c1f
2 changed files with 109 additions and 21 deletions
|
|
@ -5,7 +5,7 @@ pub use crate::arch::ProcessContext;
|
||||||
use crate::args::KernelArguments;
|
use crate::args::KernelArguments;
|
||||||
use crate::mem::{MemoryManagerHandle, PAGE_SIZE};
|
use crate::mem::{MemoryManagerHandle, PAGE_SIZE};
|
||||||
use core::{mem, slice};
|
use core::{mem, slice};
|
||||||
use xous::{MemoryFlags, CID, PID, SID};
|
use xous::{MemoryAddress, MemoryFlags, MemorySize, CID, PID, SID};
|
||||||
|
|
||||||
const MAX_PROCESS_COUNT: usize = 32;
|
const MAX_PROCESS_COUNT: usize = 32;
|
||||||
const MAX_SERVER_COUNT: usize = 32;
|
const MAX_SERVER_COUNT: usize = 32;
|
||||||
|
|
@ -141,21 +141,39 @@ enum QueuedMessage {
|
||||||
Empty,
|
Empty,
|
||||||
ScalarMessage(
|
ScalarMessage(
|
||||||
usize, /* sender */
|
usize, /* sender */
|
||||||
usize, /* response flag */
|
usize, /* unused */
|
||||||
usize, /* id */
|
usize, /* id */
|
||||||
usize, /* arg1 */
|
usize, /* arg1 */
|
||||||
usize, /* arg2 */
|
usize, /* arg2 */
|
||||||
usize, /* arg3 */
|
usize, /* arg3 */
|
||||||
usize, /* arg4 */
|
usize, /* arg4 */
|
||||||
),
|
),
|
||||||
MemoryMessage(
|
MemoryMessageSend(
|
||||||
usize, /* sender */
|
usize, /* sender */
|
||||||
usize, /* response flag */
|
usize, /* unused */
|
||||||
usize, /* id */
|
usize, /* id */
|
||||||
usize, /* in_buf */
|
usize, /* buf */
|
||||||
usize, /* in_buf_size */
|
usize, /* buf_size */
|
||||||
usize, /* out_buf */
|
usize, /* offset */
|
||||||
usize, /* out_buf_size */
|
usize, /* valid */
|
||||||
|
),
|
||||||
|
MemoryMessageROLend(
|
||||||
|
usize, /* sender */
|
||||||
|
usize, /* unused */
|
||||||
|
usize, /* id */
|
||||||
|
usize, /* buf */
|
||||||
|
usize, /* buf_size */
|
||||||
|
usize, /* offset */
|
||||||
|
usize, /* valid */
|
||||||
|
),
|
||||||
|
MemoryMessageRWLend(
|
||||||
|
usize, /* sender */
|
||||||
|
usize, /* unused */
|
||||||
|
usize, /* id */
|
||||||
|
usize, /* buf */
|
||||||
|
usize, /* buf_size */
|
||||||
|
usize, /* offset */
|
||||||
|
usize, /* valid */
|
||||||
),
|
),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -179,11 +197,82 @@ pub struct Server {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Server {
|
impl Server {
|
||||||
pub fn take_next_message(&mut self) -> Option<&'static QueuedMessage> {
|
pub fn take_next_message(&mut self) -> Option<xous::MessageEnvelope> {
|
||||||
if self.queue[self.queue_index] == QueuedMessage::Empty {
|
let result = match self.queue[self.queue_index] {
|
||||||
return None;
|
QueuedMessage::Empty => return None,
|
||||||
}
|
QueuedMessage::MemoryMessageROLend(
|
||||||
let result = &self.queue[self.queue_index];
|
sender,
|
||||||
|
_unused,
|
||||||
|
id,
|
||||||
|
buf,
|
||||||
|
buf_size,
|
||||||
|
offset,
|
||||||
|
valid,
|
||||||
|
) => xous::MessageEnvelope {
|
||||||
|
sender: sender,
|
||||||
|
message: xous::Message::ImmutableBorrow(xous::MemoryMessage {
|
||||||
|
id,
|
||||||
|
buf: MemoryAddress::new(buf),
|
||||||
|
buf_size: MemorySize::new(buf_size),
|
||||||
|
_offset: MemorySize::new(offset),
|
||||||
|
_valid: MemorySize::new(valid),
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
QueuedMessage::MemoryMessageRWLend(
|
||||||
|
sender,
|
||||||
|
_unused,
|
||||||
|
id,
|
||||||
|
buf,
|
||||||
|
buf_size,
|
||||||
|
offset,
|
||||||
|
valid,
|
||||||
|
) => xous::MessageEnvelope {
|
||||||
|
sender: sender,
|
||||||
|
message: xous::Message::MutableBorrow(xous::MemoryMessage {
|
||||||
|
id,
|
||||||
|
buf: MemoryAddress::new(buf),
|
||||||
|
buf_size: MemorySize::new(buf_size),
|
||||||
|
_offset: MemorySize::new(offset),
|
||||||
|
_valid: MemorySize::new(valid),
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
QueuedMessage::MemoryMessageSend(
|
||||||
|
sender,
|
||||||
|
_unused,
|
||||||
|
id,
|
||||||
|
buf,
|
||||||
|
buf_size,
|
||||||
|
offset,
|
||||||
|
valid,
|
||||||
|
) => xous::MessageEnvelope {
|
||||||
|
sender: sender,
|
||||||
|
message: xous::Message::Move(xous::MemoryMessage {
|
||||||
|
id,
|
||||||
|
buf: MemoryAddress::new(buf),
|
||||||
|
buf_size: MemorySize::new(buf_size),
|
||||||
|
_offset: MemorySize::new(offset),
|
||||||
|
_valid: MemorySize::new(valid),
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
QueuedMessage::ScalarMessage(
|
||||||
|
sender,
|
||||||
|
_unused,
|
||||||
|
id,
|
||||||
|
arg1,
|
||||||
|
arg2,
|
||||||
|
arg3,
|
||||||
|
arg4,
|
||||||
|
) => xous::MessageEnvelope {
|
||||||
|
sender: sender,
|
||||||
|
message: xous::Message::Scalar(xous::ScalarMessage {
|
||||||
|
id,
|
||||||
|
arg1,
|
||||||
|
arg2,
|
||||||
|
arg3,
|
||||||
|
arg4,
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
};
|
||||||
self.queue_index += 1;
|
self.queue_index += 1;
|
||||||
if self.queue_index >= self.queue.len() {
|
if self.queue_index >= self.queue.len() {
|
||||||
self.queue_index = 0;
|
self.queue_index = 0;
|
||||||
|
|
@ -524,7 +613,7 @@ impl SystemServices {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Get a server based on a SID
|
/// Get a server based on a SID
|
||||||
pub fn get_server(&mut self, sid: SID) -> Option<&Server> {
|
pub fn server_mut(&mut self, sid: SID) -> Option<&mut Server> {
|
||||||
for server in self.servers.iter_mut() {
|
for server in self.servers.iter_mut() {
|
||||||
if server.sid == sid {
|
if server.sid == sid {
|
||||||
return Some(server);
|
return Some(server);
|
||||||
|
|
|
||||||
|
|
@ -232,11 +232,10 @@ pub fn handle(call: SysCall) -> xous::Result {
|
||||||
SysCall::WaitMessage(sid) => {
|
SysCall::WaitMessage(sid) => {
|
||||||
let mut ss = SystemServicesHandle::get();
|
let mut ss = SystemServicesHandle::get();
|
||||||
// See if there is a pending message. If so, return immediately.
|
// See if there is a pending message. If so, return immediately.
|
||||||
let server = ss.get_server(sid);
|
let mut server = match ss.server_mut(sid) {
|
||||||
if server.is_none() {
|
None => return xous::Result::Error(xous::Error::ServerNotFound),
|
||||||
return xous::Result::Error(xous::Error::ServerNotFound);
|
Some(server) => server,
|
||||||
}
|
};
|
||||||
let server = server.unwrap();
|
|
||||||
|
|
||||||
// Ensure the server is for this PID
|
// Ensure the server is for this PID
|
||||||
if server.pid != pid {
|
if server.pid != pid {
|
||||||
|
|
@ -252,7 +251,7 @@ pub fn handle(call: SysCall) -> xous::Result {
|
||||||
// and mark ourselves as awaiting an event.
|
// and mark ourselves as awaiting an event.
|
||||||
let ppid = ss.get_process(pid).expect("Can't get current process").ppid;
|
let ppid = ss.get_process(pid).expect("Can't get current process").ppid;
|
||||||
assert_ne!(ppid, 0, "no parent process id");
|
assert_ne!(ppid, 0, "no parent process id");
|
||||||
ss.resume_pid(ppid, ProcessState::WaitEvent)
|
ss.resume_pid(ppid, ProcessState::Sleeping)
|
||||||
.map(|_| xous::Result::ResumeProcess)
|
.map(|_| xous::Result::ResumeProcess)
|
||||||
.unwrap_or(xous::Result::Error(xous::Error::ProcessNotFound))
|
.unwrap_or(xous::Result::Error(xous::Error::ProcessNotFound))
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue