diff --git a/kernel/src/arch/hosted.rs b/kernel/src/arch/hosted.rs index e5ace70ca..59a0a2ef7 100644 --- a/kernel/src/arch/hosted.rs +++ b/kernel/src/arch/hosted.rs @@ -64,7 +64,7 @@ pub fn set_send_addr(send_addr: Sender) { #[cfg(not(test))] fn generate_pid_key() -> [u8; 16] { - use ::rand::{thread_rng, Rng}; + use rand::{thread_rng, Rng}; let mut process_key = [0u8; 16]; let mut rng = thread_rng(); for b in process_key.iter_mut() { @@ -576,7 +576,12 @@ pub fn idle() -> bool { crate::arch::process::set_current_pid(pid); let mut process = Process::current(); - let mut response_vec = Vec::new(); + let mut capacity = 9 * core::mem::size_of::(); + if let Some(mem) = response.memory() { + capacity += mem.len(); + } + let mut response_vec = Vec::with_capacity(capacity); + response_vec.extend_from_slice(&thread_id.to_le_bytes()); for word in response.to_args().iter_mut() { response_vec.extend_from_slice(&word.to_le_bytes()); diff --git a/xous-rs/src/arch/hosted.rs b/xous-rs/src/arch/hosted.rs index cf16139dc..aa172951c 100644 --- a/xous-rs/src/arch/hosted.rs +++ b/xous-rs/src/arch/hosted.rs @@ -665,7 +665,12 @@ fn _xous_syscall_to( // ); // Send the packet to the server - let mut pkt = vec![]; + let mut capacity = 9 * core::mem::size_of::(); + if let Some(mem) = call.memory() { + capacity += mem.len(); + } + + let mut pkt = Vec::with_capacity(capacity); THREAD_ID.with(|tid| pkt.extend_from_slice(&tid.borrow().to_le_bytes())); for word in &[nr, a1, a2, a3, a4, a5, a6, a7] { pkt.extend_from_slice(&word.to_le_bytes());