mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
messaging: more work on transferring messages
Still need to work on passing messages. Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
569a4196de
commit
484e21fd30
4 changed files with 147 additions and 67 deletions
|
|
@ -51,6 +51,12 @@ impl Process {
|
||||||
&mut self.contexts[self.context_nr as usize - 1]
|
&mut self.contexts[self.context_nr as usize - 1]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Return the current context number.
|
||||||
|
/// Context numbers are 0-indexed
|
||||||
|
pub fn current_context_nr(&self) -> usize {
|
||||||
|
self.context_nr as usize - 1
|
||||||
|
}
|
||||||
|
|
||||||
pub fn trap_context(&mut self) -> &mut ProcessContext {
|
pub fn trap_context(&mut self) -> &mut ProcessContext {
|
||||||
&mut self.trap_context
|
&mut self.trap_context
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@ fn next_pid_to_run(last_pid: Option<PID>) -> Option<PID> {
|
||||||
// PIDs are 1-indexed but arrays are 0-indexed. By not subtracting
|
// PIDs are 1-indexed but arrays are 0-indexed. By not subtracting
|
||||||
// 1 from the PID when we use it as an array index, we automatically
|
// 1 from the PID when we use it as an array index, we automatically
|
||||||
// pick the next process in the list.
|
// pick the next process in the list.
|
||||||
let mut current_pid = last_pid.unwrap_or(0) as usize + 2;
|
let mut current_pid = last_pid.unwrap_or(0) as usize + 1;
|
||||||
|
|
||||||
let system_services = SystemServicesHandle::get();
|
let system_services = SystemServicesHandle::get();
|
||||||
for test_idx in current_pid..system_services.processes.len() {
|
for test_idx in current_pid..system_services.processes.len() {
|
||||||
|
|
|
||||||
|
|
@ -92,7 +92,7 @@ pub struct ProcessInner {
|
||||||
pub mem_heap_max: usize,
|
pub mem_heap_max: usize,
|
||||||
|
|
||||||
/// A mapping of connection IDs to servers
|
/// A mapping of connection IDs to servers
|
||||||
pub connection_map: [u8 /* connection id */; 32],
|
pub connection_map: [u8; 32],
|
||||||
pub _reserved: [u8; 28],
|
pub _reserved: [u8; 28],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -119,6 +119,10 @@ impl Process {
|
||||||
_ => false,
|
_ => false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn current_context_nr(&self) -> usize {
|
||||||
|
ProcessHandle::get().current_context_nr()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Copy, Clone, PartialEq)]
|
#[derive(Copy, Clone, PartialEq)]
|
||||||
|
|
@ -147,7 +151,7 @@ enum QueuedMessage {
|
||||||
Empty,
|
Empty,
|
||||||
ScalarMessage(
|
ScalarMessage(
|
||||||
usize, /* sender */
|
usize, /* sender */
|
||||||
usize, /* unused */
|
usize, /* context */
|
||||||
usize, /* id */
|
usize, /* id */
|
||||||
usize, /* arg1 */
|
usize, /* arg1 */
|
||||||
usize, /* arg2 */
|
usize, /* arg2 */
|
||||||
|
|
@ -156,7 +160,7 @@ enum QueuedMessage {
|
||||||
),
|
),
|
||||||
MemoryMessageSend(
|
MemoryMessageSend(
|
||||||
usize, /* sender */
|
usize, /* sender */
|
||||||
usize, /* unused */
|
usize, /* context */
|
||||||
usize, /* id */
|
usize, /* id */
|
||||||
usize, /* buf */
|
usize, /* buf */
|
||||||
usize, /* buf_size */
|
usize, /* buf_size */
|
||||||
|
|
@ -165,7 +169,7 @@ enum QueuedMessage {
|
||||||
),
|
),
|
||||||
MemoryMessageROLend(
|
MemoryMessageROLend(
|
||||||
usize, /* sender */
|
usize, /* sender */
|
||||||
usize, /* unused */
|
usize, /* context */
|
||||||
usize, /* id */
|
usize, /* id */
|
||||||
usize, /* buf */
|
usize, /* buf */
|
||||||
usize, /* buf_size */
|
usize, /* buf_size */
|
||||||
|
|
@ -174,7 +178,7 @@ enum QueuedMessage {
|
||||||
),
|
),
|
||||||
MemoryMessageRWLend(
|
MemoryMessageRWLend(
|
||||||
usize, /* sender */
|
usize, /* sender */
|
||||||
usize, /* unused */
|
usize, /* context */
|
||||||
usize, /* id */
|
usize, /* id */
|
||||||
usize, /* buf */
|
usize, /* buf */
|
||||||
usize, /* buf_size */
|
usize, /* buf_size */
|
||||||
|
|
@ -203,88 +207,133 @@ pub struct Server {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Server {
|
impl Server {
|
||||||
pub fn take_next_message(&mut self) -> Option<xous::MessageEnvelope> {
|
/// Remove a message from the server's queue and replace it with
|
||||||
|
/// QueuedMessage::Empty. Advance the queue pointer while we're at it.
|
||||||
|
pub fn take_next_message(&mut self) -> Option<(xous::MessageEnvelope, usize)> {
|
||||||
let result = match self.queue[self.queue_index] {
|
let result = match self.queue[self.queue_index] {
|
||||||
QueuedMessage::Empty => return None,
|
QueuedMessage::Empty => return None,
|
||||||
QueuedMessage::MemoryMessageROLend(
|
QueuedMessage::MemoryMessageROLend(
|
||||||
sender,
|
sender,
|
||||||
_unused,
|
context,
|
||||||
id,
|
id,
|
||||||
buf,
|
buf,
|
||||||
buf_size,
|
buf_size,
|
||||||
offset,
|
offset,
|
||||||
valid,
|
valid,
|
||||||
) => xous::MessageEnvelope {
|
) => (
|
||||||
sender: sender,
|
xous::MessageEnvelope {
|
||||||
message: xous::Message::ImmutableBorrow(xous::MemoryMessage {
|
sender: sender,
|
||||||
id,
|
message: xous::Message::ImmutableBorrow(xous::MemoryMessage {
|
||||||
buf: MemoryAddress::new(buf),
|
id,
|
||||||
buf_size: MemorySize::new(buf_size),
|
buf: MemoryAddress::new(buf),
|
||||||
_offset: MemorySize::new(offset),
|
buf_size: MemorySize::new(buf_size),
|
||||||
_valid: MemorySize::new(valid),
|
_offset: MemorySize::new(offset),
|
||||||
}),
|
_valid: MemorySize::new(valid),
|
||||||
},
|
}),
|
||||||
|
},
|
||||||
|
context,
|
||||||
|
),
|
||||||
QueuedMessage::MemoryMessageRWLend(
|
QueuedMessage::MemoryMessageRWLend(
|
||||||
sender,
|
sender,
|
||||||
_unused,
|
context,
|
||||||
id,
|
id,
|
||||||
buf,
|
buf,
|
||||||
buf_size,
|
buf_size,
|
||||||
offset,
|
offset,
|
||||||
valid,
|
valid,
|
||||||
) => xous::MessageEnvelope {
|
) => (
|
||||||
sender: sender,
|
xous::MessageEnvelope {
|
||||||
message: xous::Message::MutableBorrow(xous::MemoryMessage {
|
sender: sender,
|
||||||
id,
|
message: xous::Message::MutableBorrow(xous::MemoryMessage {
|
||||||
buf: MemoryAddress::new(buf),
|
id,
|
||||||
buf_size: MemorySize::new(buf_size),
|
buf: MemoryAddress::new(buf),
|
||||||
_offset: MemorySize::new(offset),
|
buf_size: MemorySize::new(buf_size),
|
||||||
_valid: MemorySize::new(valid),
|
_offset: MemorySize::new(offset),
|
||||||
}),
|
_valid: MemorySize::new(valid),
|
||||||
},
|
}),
|
||||||
QueuedMessage::MemoryMessageSend(
|
},
|
||||||
sender,
|
context,
|
||||||
_unused,
|
),
|
||||||
id,
|
QueuedMessage::MemoryMessageSend(sender, context, id, buf, buf_size, offset, valid) => {
|
||||||
buf,
|
(
|
||||||
buf_size,
|
xous::MessageEnvelope {
|
||||||
offset,
|
sender: sender,
|
||||||
valid,
|
message: xous::Message::Move(xous::MemoryMessage {
|
||||||
) => xous::MessageEnvelope {
|
id,
|
||||||
sender: sender,
|
buf: MemoryAddress::new(buf),
|
||||||
message: xous::Message::Move(xous::MemoryMessage {
|
buf_size: MemorySize::new(buf_size),
|
||||||
id,
|
_offset: MemorySize::new(offset),
|
||||||
buf: MemoryAddress::new(buf),
|
_valid: MemorySize::new(valid),
|
||||||
buf_size: MemorySize::new(buf_size),
|
}),
|
||||||
_offset: MemorySize::new(offset),
|
},
|
||||||
_valid: MemorySize::new(valid),
|
context,
|
||||||
}),
|
)
|
||||||
},
|
}
|
||||||
QueuedMessage::ScalarMessage(
|
QueuedMessage::ScalarMessage(sender, context, id, arg1, arg2, arg3, arg4) => (
|
||||||
sender,
|
xous::MessageEnvelope {
|
||||||
_unused,
|
sender: sender,
|
||||||
id,
|
message: xous::Message::Scalar(xous::ScalarMessage {
|
||||||
arg1,
|
id,
|
||||||
arg2,
|
arg1,
|
||||||
arg3,
|
arg2,
|
||||||
arg4,
|
arg3,
|
||||||
) => xous::MessageEnvelope {
|
arg4,
|
||||||
sender: sender,
|
}),
|
||||||
message: xous::Message::Scalar(xous::ScalarMessage {
|
},
|
||||||
id,
|
context,
|
||||||
arg1,
|
),
|
||||||
arg2,
|
|
||||||
arg3,
|
|
||||||
arg4,
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
self.queue[self.queue_index] = QueuedMessage::Empty;
|
||||||
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;
|
||||||
}
|
}
|
||||||
Some(result)
|
Some(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Add the given message to this server's queue.
|
||||||
|
pub fn queue_message(
|
||||||
|
&mut self,
|
||||||
|
envelope: xous::MessageEnvelope,
|
||||||
|
context: usize,
|
||||||
|
) -> core::result::Result<(), xous::Error> {
|
||||||
|
if self.queue[self.queue_index] != QueuedMessage::Empty {
|
||||||
|
return Err(xous::Error::ServerQueueFull);
|
||||||
|
}
|
||||||
|
|
||||||
|
self.queue_index += 1;
|
||||||
|
if self.queue_index >= self.queue.len() {
|
||||||
|
self.queue_index = 0;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Return a context ID that is available and blocking. If no such context ID exists,
|
||||||
|
/// or if this server isn't actually ready to receive packets, return None.
|
||||||
|
pub fn take_available_context(&mut self) -> Option<usize> {
|
||||||
|
let context_index = match self.state {
|
||||||
|
ServerState::Ready(0) => return None,
|
||||||
|
ServerState::Ready(x) => x,
|
||||||
|
_ => return None,
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut test_ctx_mask = 1;
|
||||||
|
let mut ctx_number = 0;
|
||||||
|
loop {
|
||||||
|
// If the context mask matches this context number, remove it
|
||||||
|
// and return the index.
|
||||||
|
if context_index & test_ctx_mask == test_ctx_mask {
|
||||||
|
self.state = ServerState::Ready(context_index & !test_ctx_mask);
|
||||||
|
return Some(ctx_number);
|
||||||
|
}
|
||||||
|
// Advance to the next slot.
|
||||||
|
test_ctx_mask = test_ctx_mask.rotate_left(1);
|
||||||
|
ctx_number = ctx_number + 1;
|
||||||
|
if test_ctx_mask == 1 {
|
||||||
|
panic!("didn't find a free context, even though there should be one");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for Server {
|
impl Default for Server {
|
||||||
|
|
@ -326,6 +375,12 @@ pub struct SystemServices {
|
||||||
|
|
||||||
/// A table of all servers in the system
|
/// A table of all servers in the system
|
||||||
servers: [Server; MAX_SERVER_COUNT],
|
servers: [Server; MAX_SERVER_COUNT],
|
||||||
|
|
||||||
|
/// A log of the currently-active syscall depth
|
||||||
|
syscall_stack: [(usize, usize); 3],
|
||||||
|
|
||||||
|
/// How many entries there are on the syscall stack
|
||||||
|
syscall_depth: usize,
|
||||||
}
|
}
|
||||||
|
|
||||||
static mut SYSTEM_SERVICES: SystemServices = SystemServices {
|
static mut SYSTEM_SERVICES: SystemServices = SystemServices {
|
||||||
|
|
@ -342,6 +397,8 @@ static mut SYSTEM_SERVICES: SystemServices = SystemServices {
|
||||||
queue_index: 0,
|
queue_index: 0,
|
||||||
queue: &[],
|
queue: &[],
|
||||||
}; MAX_SERVER_COUNT],
|
}; MAX_SERVER_COUNT],
|
||||||
|
syscall_stack: [(0, 0), (0, 0), (0, 0)],
|
||||||
|
syscall_depth: 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
impl core::fmt::Debug for Process {
|
impl core::fmt::Debug for Process {
|
||||||
|
|
|
||||||
|
|
@ -225,7 +225,7 @@ pub fn handle(call: SysCall) -> core::result::Result<xous::Result, xous::Error>
|
||||||
.map(|_| Ok(xous::Result::ResumeProcess))
|
.map(|_| Ok(xous::Result::ResumeProcess))
|
||||||
.unwrap_or(Err(xous::Error::ProcessNotFound))
|
.unwrap_or(Err(xous::Error::ProcessNotFound))
|
||||||
}
|
}
|
||||||
SysCall::WaitMessage(sid) => {
|
SysCall::ReceiveMessage(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 mut server = ss.server_mut(sid).ok_or(xous::Error::ServerNotFound)?;
|
let mut server = ss.server_mut(sid).ok_or(xous::Error::ServerNotFound)?;
|
||||||
|
|
@ -237,7 +237,7 @@ pub fn handle(call: SysCall) -> core::result::Result<xous::Result, xous::Error>
|
||||||
|
|
||||||
// If there is a pending message, return it immediately.
|
// If there is a pending message, return it immediately.
|
||||||
if let Some(msg) = server.take_next_message() {
|
if let Some(msg) = server.take_next_message() {
|
||||||
return Ok(xous::Result::Message(msg));
|
return Ok(xous::Result::Message(msg.0));
|
||||||
}
|
}
|
||||||
|
|
||||||
// There is no pending message, so return control to the parent process
|
// There is no pending message, so return control to the parent process
|
||||||
|
|
@ -270,6 +270,23 @@ pub fn handle(call: SysCall) -> core::result::Result<xous::Result, xous::Error>
|
||||||
SysCall::SendMessage(cid, message) => {
|
SysCall::SendMessage(cid, message) => {
|
||||||
let mut ss = SystemServicesHandle::get();
|
let mut ss = SystemServicesHandle::get();
|
||||||
let server = ss.server_from_cid(cid).ok_or(xous::Error::ServerNotFound)?;
|
let server = ss.server_from_cid(cid).ok_or(xous::Error::ServerNotFound)?;
|
||||||
|
|
||||||
|
// If the server has an available context to receive the message, transfer it right away.
|
||||||
|
if let Some(ctx_number) = server.take_available_context() {
|
||||||
|
// We can pass control on to this context, and add the existing context
|
||||||
|
// to the blocking pool.
|
||||||
|
} else {
|
||||||
|
// There is no server context we can use, so add the message to
|
||||||
|
// the queue.
|
||||||
|
let current_pid = ss.current_pid();
|
||||||
|
let context_nr = ss.get_process(current_pid)?.current_context_nr();
|
||||||
|
|
||||||
|
// Add this message to the queue. If the queue is full, this
|
||||||
|
// returns an error.
|
||||||
|
server.queue_message(MessageEnvelope { sender: 0, message }, context_nr)?;
|
||||||
|
|
||||||
|
// Park this context. This is roughly equivalent to a "Yield".
|
||||||
|
}
|
||||||
Err(xous::Error::UnhandledSyscall)
|
Err(xous::Error::UnhandledSyscall)
|
||||||
}
|
}
|
||||||
_ => Err(xous::Error::UnhandledSyscall),
|
_ => Err(xous::Error::UnhandledSyscall),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue