remove unused buffer package

This commit is contained in:
bunnie 2021-05-05 01:37:03 +08:00
parent d17ae106f1
commit e7e7711f2d
2 changed files with 0 additions and 132 deletions

View file

@ -1,130 +0,0 @@
use crate::{
map_memory, send_message, Error, MemoryMessage, MemoryRange, MemorySize, Message,
Result, CID,
};
#[derive(Debug)]
pub struct XousBuffer<'a> {
range: MemoryRange,
valid: MemoryRange,
slice: &'a mut [u8],
should_drop: bool,
}
impl<'a> XousBuffer<'a> {
#[allow(dead_code)]
pub fn new(len: usize) -> Self {
let remainder = if ((len & 0xFFF) == 0) && (len > 0) {
0
} else {
0x1000 - (len & 0xFFF)
};
#[cfg(feature = "bit-flags")]
let flags = crate::MemoryFlags::R | crate::MemoryFlags::W;
#[cfg(not(feature = "bit-flags"))]
let flags = 0b0000_0010 | 0b0000_0100;
let new_mem = map_memory(
None,
None,
// Ensure our byte size is a multiple of 4096
len + remainder,
flags,
)
.expect("XousBuffer: error in new()/map_memory");
let mut valid = new_mem;
valid.size = MemorySize::new(len + remainder).unwrap();
XousBuffer {
range: new_mem,
slice: unsafe {
core::slice::from_raw_parts_mut(new_mem.as_mut_ptr(), len + remainder)
},
valid,
should_drop: true,
}
}
#[allow(dead_code)]
pub unsafe fn from_memory_message(mem: &'a MemoryMessage) -> Self {
XousBuffer {
range: mem.buf,
slice: core::slice::from_raw_parts_mut(mem.buf.as_mut_ptr(), mem.buf.len()),
valid: mem.buf,
should_drop: false,
}
}
/// Perform a mutable lend of this Carton to the server.
#[allow(dead_code)]
pub fn lend_mut(&mut self, connection: CID, id: u32) -> core::result::Result<Result, Error> {
let msg = MemoryMessage {
id: id as usize,
buf: self.valid,
offset: None,
valid: crate::MemorySize::new(self.slice.len()),
};
send_message(connection, Message::MutableBorrow(msg))
}
#[allow(dead_code)]
pub fn lend(&self, connection: CID, id: u32) -> core::result::Result<Result, Error> {
let msg = MemoryMessage {
id: id as usize,
buf: self.valid,
offset: None,
valid: crate::MemorySize::new(self.slice.len()),
};
send_message(connection, Message::Borrow(msg))
}
#[allow(dead_code)]
pub fn send(mut self, connection: CID, id: u32) -> core::result::Result<Result, Error> {
let msg = crate::MemoryMessage {
id: id as usize,
buf: self.valid,
offset: None,
valid: crate::MemorySize::new(self.slice.len()),
};
let result = send_message(connection, Message::Move(msg))?;
// prevents it from being Dropped.
self.should_drop = false;
Ok(result)
}
}
impl<'a> core::convert::AsRef<[u8]> for XousBuffer<'a> {
fn as_ref(&self) -> &[u8] {
self.slice
}
}
impl<'a> core::convert::AsMut<[u8]> for XousBuffer<'a> {
fn as_mut(&mut self) -> &mut [u8] {
self.slice
}
}
impl<'a> core::ops::Deref for XousBuffer<'a> {
type Target = [u8];
fn deref(&self) -> &Self::Target {
&*self.slice
}
}
impl<'a> core::ops::DerefMut for XousBuffer<'a> {
fn deref_mut(&mut self) -> &mut Self::Target {
&mut *self.slice
}
}
impl<'a> Drop for XousBuffer<'a> {
fn drop(&mut self) {
if self.should_drop {
crate::unmap_memory(self.range).expect("XousBuffer: failed to drop memory");
}
}
}

View file

@ -15,7 +15,6 @@ pub mod carton;
pub mod definitions;
mod messages;
pub mod buffer;
pub mod process;
pub mod string;
pub mod syscall;
@ -23,7 +22,6 @@ pub mod syscall;
pub mod names;
pub use arch::{ProcessArgs, ProcessInit, ProcessKey, ThreadInit};
pub use buffer::XousBuffer;
pub use definitions::*;
pub use messages::*;
pub use string::*;