From 8f741596741d865e58642d327000f13e0df652c8 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Mon, 13 Jul 2020 19:19:25 +0800 Subject: [PATCH] rename ImmutableBorrow -> Borrow THis is more in-line with Rust conventions. Signed-off-by: Sean Cross --- examples/log/src/main.rs | 2 +- kernel/src/arch/hosted/mod.rs | 2 +- kernel/src/server.rs | 8 +++--- kernel/src/syscall.rs | 8 +++--- kernel/src/test/mod.rs | 52 +++++++++++++++++++++++++++++++++++ xous-rs/src/definitions.rs | 6 ++-- xous-rs/src/hosted/mod.rs | 4 +-- xous-rs/src/syscall.rs | 4 +-- 8 files changed, 69 insertions(+), 17 deletions(-) diff --git a/examples/log/src/main.rs b/examples/log/src/main.rs index 2c218e936..db74e2197 100644 --- a/examples/log/src/main.rs +++ b/examples/log/src/main.rs @@ -86,7 +86,7 @@ fn main() { let log_entry = LogString::from_message(msg); println!("Moved log message from {}: {}", envelope.sender, log_entry); } - xous::Message::ImmutableBorrow(msg) => { + xous::Message::Borrow(msg) => { let log_entry = LogString::from_message(msg); println!("Immutably borrowed log message from {}: {}", envelope.sender, log_entry); } diff --git a/kernel/src/arch/hosted/mod.rs b/kernel/src/arch/hosted/mod.rs index 42fade28d..6cb8ee51c 100644 --- a/kernel/src/arch/hosted/mod.rs +++ b/kernel/src/arch/hosted/mod.rs @@ -77,7 +77,7 @@ fn handle_connection(mut conn: TcpStream, pid: PID, chn: Sender) if let SysCall::SendMessage(ref _cid, ref mut envelope) = call { match envelope { xous::Message::MutableBorrow(msg) - | xous::Message::ImmutableBorrow(msg) + | xous::Message::Borrow(msg) | xous::Message::Move(msg) => { let mut tmp_data = Vec::with_capacity(msg.buf.len()); tmp_data.resize(msg.buf.len(), 0); diff --git a/kernel/src/server.rs b/kernel/src/server.rs index d133c6170..b1016cb34 100644 --- a/kernel/src/server.rs +++ b/kernel/src/server.rs @@ -309,7 +309,7 @@ impl Server { ) => ( xous::MessageEnvelope { sender: self.queue_tail | (server_idx << 16), - message: xous::Message::ImmutableBorrow(xous::MemoryMessage { + message: xous::Message::Borrow(xous::MemoryMessage { id, buf: MemoryRange::new(buf, buf_size), offset: MemorySize::new(offset), @@ -357,7 +357,7 @@ impl Server { ) => ( xous::MessageEnvelope { sender: self.queue_tail | (server_idx << 16), - message: xous::Message::ImmutableBorrow(xous::MemoryMessage { + message: xous::Message::Borrow(xous::MemoryMessage { id, buf: MemoryRange::new(buf, buf_size), offset: MemorySize::new(offset), @@ -495,7 +495,7 @@ impl Server { msg.offset.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), original_address.map(|x| x.get()).unwrap_or(0), msg.id, @@ -527,7 +527,7 @@ impl Server { } let (server_address, len) = match message { 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()) } }; diff --git a/kernel/src/syscall.rs b/kernel/src/syscall.rs index 50022310d..5717996ae 100644 --- a/kernel/src/syscall.rs +++ b/kernel/src/syscall.rs @@ -338,7 +338,7 @@ pub fn handle(pid: PID, call: SysCall) -> core::result::Result None, Message::Move(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 @@ -381,7 +381,7 @@ pub fn handle(pid: PID, call: SysCall) -> core::result::Result { + Message::Borrow(msg) => { let new_virt = ss.lend_memory( msg.buf.as_mut_ptr(), server_pid, @@ -390,7 +390,7 @@ pub fn handle(pid: PID, call: SysCall) -> core::result::Result core::result::Result 0, - Message::ImmutableBorrow(_) | Message::MutableBorrow(_) => ss + Message::Borrow(_) | Message::MutableBorrow(_) => ss .remember_server_message( sidx, pid, diff --git a/kernel/src/test/mod.rs b/kernel/src/test/mod.rs index 634c2fc0d..1d5193e3b 100644 --- a/kernel/src/test/mod.rs +++ b/kernel/src/test/mod.rs @@ -170,3 +170,55 @@ fn send_move_message() { 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"); +} diff --git a/xous-rs/src/definitions.rs b/xous-rs/src/definitions.rs index 5f589daf0..fbe69bb01 100644 --- a/xous-rs/src/definitions.rs +++ b/xous-rs/src/definitions.rs @@ -244,7 +244,7 @@ impl ScalarMessage { #[derive(Debug, PartialEq)] pub enum Message { MutableBorrow(MemoryMessage), - ImmutableBorrow(MemoryMessage), + Borrow(MemoryMessage), Move(MemoryMessage), Scalar(ScalarMessage), } @@ -260,7 +260,7 @@ impl MessageEnvelope { pub fn to_usize(&self) -> [usize; 7] { let ret = match &self.message { 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::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]) { 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]) { None => return Result::Error(Error::InternalError), diff --git a/xous-rs/src/hosted/mod.rs b/xous-rs/src/hosted/mod.rs index 0c10051c3..3d92b3c9a 100644 --- a/xous-rs/src/hosted/mod.rs +++ b/xous-rs/src/hosted/mod.rs @@ -88,7 +88,7 @@ fn _xous_syscall_to( offset: _offset, valid: _valid, }) - | crate::Message::ImmutableBorrow(crate::MemoryMessage { + | crate::Message::Borrow(crate::MemoryMessage { id: _id, buf, offset: _offset, @@ -159,7 +159,7 @@ fn _xous_syscall_to( } }*/ // Nothing to do for Immutable borrow, since the memory can't change - crate::Message::ImmutableBorrow(_) => (), + crate::Message::Borrow(_) => (), crate::Message::Scalar(_) => (), } } diff --git a/xous-rs/src/syscall.rs b/xous-rs/src/syscall.rs index d293aa34a..048f8e39e 100644 --- a/xous-rs/src/syscall.rs +++ b/xous-rs/src/syscall.rs @@ -437,7 +437,7 @@ impl SysCall { mm.offset.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, *a1, 2, @@ -568,7 +568,7 @@ impl SysCall { ), 2 => SysCall::SendMessage( a1, - Message::ImmutableBorrow(MemoryMessage { + Message::Borrow(MemoryMessage { id: a3, buf: MemoryRange::new(a4, a5), offset: MemoryAddress::new(a6),