metta-systems
/
vesper
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Rename nightly allocator API fns

This commit is contained in:
Berkus Decker 2020-12-13 19:38:22 +02:00
parent 7e9d325b14
commit a53ede11af
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nucleus/src/mm/bump_allocator.rs
View File

@ -8,7 +8,7 @@
use { use {
crate::println, crate::println,
core::{ core::{
alloc::{AllocError, AllocRef, Layout}, alloc::{AllocError, Allocator, Layout},
cell::Cell, cell::Cell,
ptr::NonNull, ptr::NonNull,
}, },
@ -20,9 +20,9 @@ pub struct BumpAllocator {
name: &'static str, name: &'static str,
} }
unsafe impl AllocRef for BumpAllocator { unsafe impl Allocator for BumpAllocator {
/// Allocate a memory block from the pool. /// Allocate a memory block from the pool.
fn alloc(&self, layout: Layout) -> Result<NonNull<[u8]>, AllocError> { fn allocate(&self, layout: Layout) -> Result<NonNull<[u8]>, AllocError> {
let start = crate::mm::aligned_addr_unchecked(self.next.get(), layout.align()); let start = crate::mm::aligned_addr_unchecked(self.next.get(), layout.align());
let end = start + layout.size(); let end = start + layout.size();
@ -50,7 +50,7 @@ unsafe impl AllocRef for BumpAllocator {
} }
/// A bump allocator doesn't care about releasing memory. /// A bump allocator doesn't care about releasing memory.
unsafe fn dealloc(&self, _ptr: NonNull<u8>, _layout: Layout) {} unsafe fn deallocate(&self, _ptr: NonNull<u8>, _layout: Layout) {}
} }
impl BumpAllocator { impl BumpAllocator {
@ -73,12 +73,12 @@ mod tests {
#[test_case] #[test_case]
fn test_allocates_within_init_range() { fn test_allocates_within_init_range() {
let allocator = BumpAllocator::new(256, 512, "Test allocator 1"); let allocator = BumpAllocator::new(256, 512, "Test allocator 1");
let result1 = allocator.alloc(unsafe { Layout::from_size_align_unchecked(128, 1) }); let result1 = allocator.allocate(unsafe { Layout::from_size_align_unchecked(128, 1) });
assert!(result1.is_ok()); assert!(result1.is_ok());
let result2 = allocator.alloc(unsafe { Layout::from_size_align_unchecked(128, 32) }); let result2 = allocator.allocate(unsafe { Layout::from_size_align_unchecked(128, 32) });
println!("{:?}", result2); println!("{:?}", result2);
assert!(result2.is_ok()); assert!(result2.is_ok());
let result3 = allocator.alloc(unsafe { Layout::from_size_align_unchecked(1, 1) }); let result3 = allocator.allocate(unsafe { Layout::from_size_align_unchecked(1, 1) });
assert!(result3.is_err()); assert!(result3.is_err());
} }
// Creating with end <= start sshould fail // Creating with end <= start sshould fail
@ -86,7 +86,7 @@ mod tests {
#[test_case] #[test_case]
fn test_bad_allocator() { fn test_bad_allocator() {
let bad_allocator = BumpAllocator::new(512, 256, "Test allocator 2"); let bad_allocator = BumpAllocator::new(512, 256, "Test allocator 2");
let result1 = bad_allocator.alloc(unsafe { Layout::from_size_align_unchecked(1, 1) }); let result1 = bad_allocator.allocate(unsafe { Layout::from_size_align_unchecked(1, 1) });
assert!(result1.is_err()); assert!(result1.is_err());
} }
} }

4
nucleus/src/platform/rpi3/mailbox.rs
View File

@ -358,10 +358,10 @@ impl PreparedMailbox {
impl Mailbox { impl Mailbox {
/// Create a new mailbox in the DMA-able memory area. /// Create a new mailbox in the DMA-able memory area.
pub fn new(base_addr: usize) -> ::core::result::Result<Mailbox, ()> { pub fn new(base_addr: usize) -> ::core::result::Result<Mailbox, ()> {
use core::alloc::AllocRef; use core::alloc::Allocator;
crate::DMA_ALLOCATOR crate::DMA_ALLOCATOR
.lock(|dma| { .lock(|dma| {
dma.alloc_zeroed( dma.allocate_zeroed(
core::alloc::Layout::from_size_align( core::alloc::Layout::from_size_align(
MAILBOX_ITEMS_COUNT * core::mem::size_of::<u32>(), MAILBOX_ITEMS_COUNT * core::mem::size_of::<u32>(),
MAILBOX_ALIGNMENT, MAILBOX_ALIGNMENT,