mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
rename ImmutableBorrow -> Borrow
THis is more in-line with Rust conventions. Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
85c719643a
commit
8f74159674
8 changed files with 69 additions and 17 deletions
|
|
@ -86,7 +86,7 @@ fn main() {
|
||||||
let log_entry = LogString::from_message(msg);
|
let log_entry = LogString::from_message(msg);
|
||||||
println!("Moved log message from {}: {}", envelope.sender, log_entry);
|
println!("Moved log message from {}: {}", envelope.sender, log_entry);
|
||||||
}
|
}
|
||||||
xous::Message::ImmutableBorrow(msg) => {
|
xous::Message::Borrow(msg) => {
|
||||||
let log_entry = LogString::from_message(msg);
|
let log_entry = LogString::from_message(msg);
|
||||||
println!("Immutably borrowed log message from {}: {}", envelope.sender, log_entry);
|
println!("Immutably borrowed log message from {}: {}", envelope.sender, log_entry);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,7 @@ fn handle_connection(mut conn: TcpStream, pid: PID, chn: Sender<ThreadMessage>)
|
||||||
if let SysCall::SendMessage(ref _cid, ref mut envelope) = call {
|
if let SysCall::SendMessage(ref _cid, ref mut envelope) = call {
|
||||||
match envelope {
|
match envelope {
|
||||||
xous::Message::MutableBorrow(msg)
|
xous::Message::MutableBorrow(msg)
|
||||||
| xous::Message::ImmutableBorrow(msg)
|
| xous::Message::Borrow(msg)
|
||||||
| xous::Message::Move(msg) => {
|
| xous::Message::Move(msg) => {
|
||||||
let mut tmp_data = Vec::with_capacity(msg.buf.len());
|
let mut tmp_data = Vec::with_capacity(msg.buf.len());
|
||||||
tmp_data.resize(msg.buf.len(), 0);
|
tmp_data.resize(msg.buf.len(), 0);
|
||||||
|
|
|
||||||
|
|
@ -309,7 +309,7 @@ impl Server {
|
||||||
) => (
|
) => (
|
||||||
xous::MessageEnvelope {
|
xous::MessageEnvelope {
|
||||||
sender: self.queue_tail | (server_idx << 16),
|
sender: self.queue_tail | (server_idx << 16),
|
||||||
message: xous::Message::ImmutableBorrow(xous::MemoryMessage {
|
message: xous::Message::Borrow(xous::MemoryMessage {
|
||||||
id,
|
id,
|
||||||
buf: MemoryRange::new(buf, buf_size),
|
buf: MemoryRange::new(buf, buf_size),
|
||||||
offset: MemorySize::new(offset),
|
offset: MemorySize::new(offset),
|
||||||
|
|
@ -357,7 +357,7 @@ impl Server {
|
||||||
) => (
|
) => (
|
||||||
xous::MessageEnvelope {
|
xous::MessageEnvelope {
|
||||||
sender: self.queue_tail | (server_idx << 16),
|
sender: self.queue_tail | (server_idx << 16),
|
||||||
message: xous::Message::ImmutableBorrow(xous::MemoryMessage {
|
message: xous::Message::Borrow(xous::MemoryMessage {
|
||||||
id,
|
id,
|
||||||
buf: MemoryRange::new(buf, buf_size),
|
buf: MemoryRange::new(buf, buf_size),
|
||||||
offset: MemorySize::new(offset),
|
offset: MemorySize::new(offset),
|
||||||
|
|
@ -495,7 +495,7 @@ impl Server {
|
||||||
msg.offset.map(|x| x.get()).unwrap_or(0) as usize,
|
msg.offset.map(|x| x.get()).unwrap_or(0) as usize,
|
||||||
msg.valid.map(|x| x.get()).unwrap_or(0) as usize,
|
msg.valid.map(|x| x.get()).unwrap_or(0) as usize,
|
||||||
),
|
),
|
||||||
xous::Message::ImmutableBorrow(msg) => QueuedMessage::MemoryMessageROLend(
|
xous::Message::Borrow(msg) => QueuedMessage::MemoryMessageROLend(
|
||||||
pid.get() as usize | (context << 16),
|
pid.get() as usize | (context << 16),
|
||||||
original_address.map(|x| x.get()).unwrap_or(0),
|
original_address.map(|x| x.get()).unwrap_or(0),
|
||||||
msg.id,
|
msg.id,
|
||||||
|
|
@ -527,7 +527,7 @@ impl Server {
|
||||||
}
|
}
|
||||||
let (server_address, len) = match message {
|
let (server_address, len) = match message {
|
||||||
xous::Message::Scalar(_) | xous::Message::Move(_) => (0, 0),
|
xous::Message::Scalar(_) | xous::Message::Move(_) => (0, 0),
|
||||||
xous::Message::MutableBorrow(msg) | xous::Message::ImmutableBorrow(msg) => {
|
xous::Message::MutableBorrow(msg) | xous::Message::Borrow(msg) => {
|
||||||
(msg.buf.addr.get(), msg.buf.size.get())
|
(msg.buf.addr.get(), msg.buf.size.get())
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -338,7 +338,7 @@ pub fn handle(pid: PID, call: SysCall) -> core::result::Result<xous::Result, xou
|
||||||
Message::Scalar(_) => None,
|
Message::Scalar(_) => None,
|
||||||
Message::Move(msg)
|
Message::Move(msg)
|
||||||
| Message::MutableBorrow(msg)
|
| Message::MutableBorrow(msg)
|
||||||
| Message::ImmutableBorrow(msg) => Some(msg.buf.addr),
|
| Message::Borrow(msg) => Some(msg.buf.addr),
|
||||||
};
|
};
|
||||||
|
|
||||||
// Translate memory messages from the client process to the server
|
// Translate memory messages from the client process to the server
|
||||||
|
|
@ -381,7 +381,7 @@ pub fn handle(pid: PID, call: SysCall) -> core::result::Result<xous::Result, xou
|
||||||
true,
|
true,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
Message::ImmutableBorrow(msg) => {
|
Message::Borrow(msg) => {
|
||||||
let new_virt = ss.lend_memory(
|
let new_virt = ss.lend_memory(
|
||||||
msg.buf.as_mut_ptr(),
|
msg.buf.as_mut_ptr(),
|
||||||
server_pid,
|
server_pid,
|
||||||
|
|
@ -390,7 +390,7 @@ pub fn handle(pid: PID, call: SysCall) -> core::result::Result<xous::Result, xou
|
||||||
false,
|
false,
|
||||||
)?;
|
)?;
|
||||||
(
|
(
|
||||||
Message::ImmutableBorrow(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,
|
||||||
|
|
@ -414,7 +414,7 @@ pub fn handle(pid: PID, call: SysCall) -> core::result::Result<xous::Result, xou
|
||||||
);
|
);
|
||||||
let sender = match message {
|
let sender = match message {
|
||||||
Message::Scalar(_) | Message::Move(_) => 0,
|
Message::Scalar(_) | Message::Move(_) => 0,
|
||||||
Message::ImmutableBorrow(_) | Message::MutableBorrow(_) => ss
|
Message::Borrow(_) | Message::MutableBorrow(_) => ss
|
||||||
.remember_server_message(
|
.remember_server_message(
|
||||||
sidx,
|
sidx,
|
||||||
pid,
|
pid,
|
||||||
|
|
|
||||||
|
|
@ -170,3 +170,55 @@ fn send_move_message() {
|
||||||
|
|
||||||
main_thread.join().expect("couldn't join kernel process");
|
main_thread.join().expect("couldn't join kernel process");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn send_borrow_message() {
|
||||||
|
let server_spec = "localhost:9997";
|
||||||
|
|
||||||
|
let main_thread = start_kernel(server_spec);
|
||||||
|
|
||||||
|
let xous_client_spec = server_spec.to_owned();
|
||||||
|
let xous_server_spec = server_spec.to_owned();
|
||||||
|
|
||||||
|
let (server_addr_send, server_addr_recv) = channel();
|
||||||
|
|
||||||
|
let xous_server = spawn(move || {
|
||||||
|
xous::hosted::set_xous_address(&xous_client_spec);
|
||||||
|
let sid = xous::create_server(0x7884_3123).expect("couldn't create test server");
|
||||||
|
server_addr_send.send(sid).unwrap();
|
||||||
|
let envelope = xous::receive_message(sid).expect("couldn't receive messages");
|
||||||
|
println!("Received message from {}", envelope.sender);
|
||||||
|
let message = envelope.message;
|
||||||
|
if let xous::Message::Borrow(m) = message {
|
||||||
|
let buf = m.buf;
|
||||||
|
let bt = unsafe {
|
||||||
|
Box::from_raw(core::slice::from_raw_parts_mut(buf.as_mut_ptr(), buf.len()))
|
||||||
|
};
|
||||||
|
let s = String::from_utf8_lossy(&bt);
|
||||||
|
println!("Got message: {:?} -> \"{}\"", bt, s);
|
||||||
|
} else {
|
||||||
|
panic!("unexpected message type");
|
||||||
|
}
|
||||||
|
|
||||||
|
// println!("SERVER: Received message: {:?}", msg);
|
||||||
|
});
|
||||||
|
|
||||||
|
let xous_client = spawn(move || {
|
||||||
|
xous::hosted::set_xous_address(&xous_server_spec);
|
||||||
|
// println!("CLIENT: Waiting for server address...");
|
||||||
|
let sid = server_addr_recv.recv().unwrap();
|
||||||
|
// println!("CLIENT: Connecting to server {:?}", sid);
|
||||||
|
let conn = xous::connect(sid).expect("couldn't connect to server");
|
||||||
|
let msg = xous::carton::Carton::from_bytes(format!("Hello, world!").as_bytes());
|
||||||
|
xous::send_message(conn, xous::Message::Borrow(msg.into_message(0)))
|
||||||
|
.expect("couldn't send a message");
|
||||||
|
});
|
||||||
|
|
||||||
|
xous_server.join().expect("couldn't join server process");
|
||||||
|
xous_client.join().expect("couldn't join client process");
|
||||||
|
|
||||||
|
// Any process ought to be able to shut down the system currently.
|
||||||
|
rsyscall(SysCall::Shutdown).expect("unable to shutdown server");
|
||||||
|
|
||||||
|
main_thread.join().expect("couldn't join kernel process");
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -244,7 +244,7 @@ impl ScalarMessage {
|
||||||
#[derive(Debug, PartialEq)]
|
#[derive(Debug, PartialEq)]
|
||||||
pub enum Message {
|
pub enum Message {
|
||||||
MutableBorrow(MemoryMessage),
|
MutableBorrow(MemoryMessage),
|
||||||
ImmutableBorrow(MemoryMessage),
|
Borrow(MemoryMessage),
|
||||||
Move(MemoryMessage),
|
Move(MemoryMessage),
|
||||||
Scalar(ScalarMessage),
|
Scalar(ScalarMessage),
|
||||||
}
|
}
|
||||||
|
|
@ -260,7 +260,7 @@ impl MessageEnvelope {
|
||||||
pub fn to_usize(&self) -> [usize; 7] {
|
pub fn to_usize(&self) -> [usize; 7] {
|
||||||
let ret = match &self.message {
|
let ret = match &self.message {
|
||||||
Message::MutableBorrow(m) => (0, m.to_usize()),
|
Message::MutableBorrow(m) => (0, m.to_usize()),
|
||||||
Message::ImmutableBorrow(m) => (1, m.to_usize()),
|
Message::Borrow(m) => (1, m.to_usize()),
|
||||||
Message::Move(m) => (2, m.to_usize()),
|
Message::Move(m) => (2, m.to_usize()),
|
||||||
Message::Scalar(m) => (3, m.to_usize()),
|
Message::Scalar(m) => (3, m.to_usize()),
|
||||||
};
|
};
|
||||||
|
|
@ -439,7 +439,7 @@ impl Result {
|
||||||
},
|
},
|
||||||
1 => match MemoryMessage::from_usize(src[3], src[4], src[5], src[6], src[7]) {
|
1 => match MemoryMessage::from_usize(src[3], src[4], src[5], src[6], src[7]) {
|
||||||
None => return Result::Error(Error::InternalError),
|
None => return Result::Error(Error::InternalError),
|
||||||
Some(s) => Message::ImmutableBorrow(s),
|
Some(s) => Message::Borrow(s),
|
||||||
},
|
},
|
||||||
2 => match MemoryMessage::from_usize(src[3], src[4], src[5], src[6], src[7]) {
|
2 => match MemoryMessage::from_usize(src[3], src[4], src[5], src[6], src[7]) {
|
||||||
None => return Result::Error(Error::InternalError),
|
None => return Result::Error(Error::InternalError),
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,7 @@ fn _xous_syscall_to(
|
||||||
offset: _offset,
|
offset: _offset,
|
||||||
valid: _valid,
|
valid: _valid,
|
||||||
})
|
})
|
||||||
| crate::Message::ImmutableBorrow(crate::MemoryMessage {
|
| crate::Message::Borrow(crate::MemoryMessage {
|
||||||
id: _id,
|
id: _id,
|
||||||
buf,
|
buf,
|
||||||
offset: _offset,
|
offset: _offset,
|
||||||
|
|
@ -159,7 +159,7 @@ fn _xous_syscall_to(
|
||||||
}
|
}
|
||||||
}*/
|
}*/
|
||||||
// Nothing to do for Immutable borrow, since the memory can't change
|
// Nothing to do for Immutable borrow, since the memory can't change
|
||||||
crate::Message::ImmutableBorrow(_) => (),
|
crate::Message::Borrow(_) => (),
|
||||||
crate::Message::Scalar(_) => (),
|
crate::Message::Scalar(_) => (),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -437,7 +437,7 @@ impl SysCall {
|
||||||
mm.offset.map(|x| x.get()).unwrap_or(0) as usize,
|
mm.offset.map(|x| x.get()).unwrap_or(0) as usize,
|
||||||
mm.valid.map(|x| x.get()).unwrap_or(0) as usize,
|
mm.valid.map(|x| x.get()).unwrap_or(0) as usize,
|
||||||
],
|
],
|
||||||
Message::ImmutableBorrow(mm) => [
|
Message::Borrow(mm) => [
|
||||||
SysCallNumber::SendMessage as usize,
|
SysCallNumber::SendMessage as usize,
|
||||||
*a1,
|
*a1,
|
||||||
2,
|
2,
|
||||||
|
|
@ -568,7 +568,7 @@ impl SysCall {
|
||||||
),
|
),
|
||||||
2 => SysCall::SendMessage(
|
2 => SysCall::SendMessage(
|
||||||
a1,
|
a1,
|
||||||
Message::ImmutableBorrow(MemoryMessage {
|
Message::Borrow(MemoryMessage {
|
||||||
id: a3,
|
id: a3,
|
||||||
buf: MemoryRange::new(a4, a5),
|
buf: MemoryRange::new(a4, a5),
|
||||||
offset: MemoryAddress::new(a6),
|
offset: MemoryAddress::new(a6),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue