mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-21 09:14:34 +00:00
Merge remote-tracking branch 'origin/master' into ux-refactor
This commit is contained in:
commit
799bae0386
2 changed files with 12 additions and 0 deletions
|
|
@ -687,6 +687,8 @@ fn _xous_syscall_result(ret: &mut Result, thread_id: TID, server_connection: &Se
|
||||||
eprintln!("Server shut down: {}", e);
|
eprintln!("Server shut down: {}", e);
|
||||||
std::process::exit(0);
|
std::process::exit(0);
|
||||||
}
|
}
|
||||||
|
data.shrink_to_fit();
|
||||||
|
assert_eq!(data.len(), data.capacity());
|
||||||
let len = data.len();
|
let len = data.len();
|
||||||
let addr = data.as_mut_ptr();
|
let addr = data.as_mut_ptr();
|
||||||
memory_message.buf.addr = crate::MemoryAddress::new(addr as _).unwrap();
|
memory_message.buf.addr = crate::MemoryAddress::new(addr as _).unwrap();
|
||||||
|
|
|
||||||
|
|
@ -584,6 +584,16 @@ impl Drop for MessageEnvelope {
|
||||||
.expect("couldn't return memory")
|
.expect("couldn't return memory")
|
||||||
}
|
}
|
||||||
Message::Move(msg) => {
|
Message::Move(msg) => {
|
||||||
|
// Reconstitute the vec and drop it right away to ensure it's freed.
|
||||||
|
#[cfg(any(unix, windows))]
|
||||||
|
let _v = unsafe {
|
||||||
|
std::vec::Vec::from_raw_parts(
|
||||||
|
msg.buf.as_mut_ptr(),
|
||||||
|
msg.buf.len(),
|
||||||
|
msg.buf.len(),
|
||||||
|
)
|
||||||
|
};
|
||||||
|
#[cfg(not(any(unix, windows)))]
|
||||||
crate::syscall::unmap_memory(msg.buf).expect("couldn't free memory message")
|
crate::syscall::unmap_memory(msg.buf).expect("couldn't free memory message")
|
||||||
}
|
}
|
||||||
_ => (),
|
_ => (),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue