Skip to content

fix(tlsf): forward realloc to tlsf #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Conaclos wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(tlsf): forward realloc to tlsf #124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/tlsf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,15 @@ impl Heap {
})
}

unsafe fn realloc(&self, ptr: *mut u8, new_layout: Layout) -> Option<NonNull<u8>> {
critical_section::with(|cs| {
self.heap
.borrow_ref_mut(cs)
.tlsf
.reallocate(NonNull::new_unchecked(ptr), new_layout)
})
}

/// Get the amount of bytes used by the allocator.
pub fn used(&self) -> usize {
critical_section::with(|cs| {
Expand Down Expand Up @@ -144,6 +153,15 @@ unsafe impl GlobalAlloc for Heap {
unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
self.dealloc(ptr, layout)
}

unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 {
// SAFETY: `layout.align()` is a power of two, and the size preconidtion
// is upheld by the caller
let new_layout =
unsafe { core::alloc::Layout::from_size_align_unchecked(new_size, layout.align()) };
self.realloc(ptr, new_layout)
.map_or(ptr::null_mut(), |allocation| allocation.as_ptr())
}
}

#[cfg(feature = "allocator_api")]
Expand Down