xous: add Connect syscall

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2020-03-19 17:26:01 +08:00
parent ae473b5aa7
commit 646cf9340e
2 changed files with 18 additions and 5 deletions

View file

@ -46,7 +46,7 @@ pub struct Context {
} }
#[repr(C)] #[repr(C)]
#[derive(Debug)] #[derive(Debug, PartialEq)]
/// A struct describing memory that is passed between processes. /// A struct describing memory that is passed between processes.
/// The `buf` value will get translated as necessary. /// The `buf` value will get translated as necessary.
pub struct MemoryMessage { pub struct MemoryMessage {
@ -72,7 +72,7 @@ pub struct MemoryMessage {
} }
#[repr(C)] #[repr(C)]
#[derive(Debug)] #[derive(Debug, PartialEq)]
/// A simple scalar message. This is similar to a `move` message. /// A simple scalar message. This is similar to a `move` message.
pub struct ScalarMessage { pub struct ScalarMessage {
pub id: MessageId, pub id: MessageId,
@ -83,7 +83,7 @@ pub struct ScalarMessage {
} }
#[repr(usize)] #[repr(usize)]
#[derive(Debug)] #[derive(Debug, PartialEq)]
pub enum Message { pub enum Message {
MutableBorrow(MemoryMessage), MutableBorrow(MemoryMessage),
ImmutableBorrow(MemoryMessage), ImmutableBorrow(MemoryMessage),

View file

@ -143,7 +143,9 @@ pub enum SysCall {
/// This process will now wait for an event such as an IRQ or Message. /// This process will now wait for an event such as an IRQ or Message.
WaitEvent, WaitEvent,
/// This context will now wait for a message with the given server ID /// This context will now wait for a message with the given server ID..
/// You can set up a pool by having multiple threads call `WaitMessage`
/// with the same SID.
WaitMessage(SID), WaitMessage(SID),
/// Stop running the given process. /// Stop running the given process.
@ -223,7 +225,7 @@ pub enum SysCall {
/// * **ProcessNotChild**: The given process was not a child process, and /// * **ProcessNotChild**: The given process was not a child process, and
/// therefore couldn't be resumed. /// therefore couldn't be resumed.
/// * **ProcessTerminated**: The process has crashed. /// * **ProcessTerminated**: The process has crashed.
SwitchTo(PID, usize /* thread ID */), SwitchTo(PID, usize /* context ID */),
/// Create a new Server /// Create a new Server
/// ///
@ -564,6 +566,7 @@ pub enum Result {
ResumeProcess, ResumeProcess,
ServerID(SID), ServerID(SID),
ConnectionID(CID), ConnectionID(CID),
Message(Message),
UnknownResult(usize, usize, usize, usize, usize, usize, usize), UnknownResult(usize, usize, usize, usize, usize, usize, usize),
} }
@ -655,6 +658,16 @@ pub fn create_server(name: usize) -> core::result::Result<SID, Error> {
Err(Error::InternalError) Err(Error::InternalError)
} }
/// Connect to a server with the given SID
pub fn connect(server: SID) -> core::result::Result<CID, Error> {
let result = rsyscall(SysCall::Connect(server))?;
if let Result::ConnectionID(cid) = result {
Ok(cid)
} else {
Err(Error::InternalError)
}
}
/// Suspend the current process until a message is received. This thread will /// Suspend the current process until a message is received. This thread will
/// block until a message is received. /// block until a message is received.
/// ///