michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 22:37:49 +00:00
Code Issues Projects Releases Wiki Activity

Update Allocator Designs post to use LinkedListAllocator::lock method

Browse Source
This commit is contained in:
Philipp Oppermann
2020-01-30 13:04:56 +01:00
parent 4f42826399
commit 670ac60e1b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
blog/content/second-edition/posts/11-allocator-designs/index.md
View File

@@ -701,7 +701,7 @@ unsafe impl GlobalAlloc for Locked<LinkedListAllocator> {
unsafe fn alloc(&self, layout: Layout) -> *mut u8 { unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
// perform layout adjustments // perform layout adjustments
let (size, align) = LinkedListAllocator::size_align(layout); let (size, align) = LinkedListAllocator::size_align(layout);
let mut allocator = self.inner.lock(); let mut allocator = self.lock();
if let Some((region, alloc_start)) = allocator.find_region(size, align) { if let Some((region, alloc_start)) = allocator.find_region(size, align) {
let alloc_end = alloc_start.checked_add(size).expect("overflow"); let alloc_end = alloc_start.checked_add(size).expect("overflow");
@@ -719,7 +719,7 @@ unsafe impl GlobalAlloc for Locked<LinkedListAllocator> {
// perform layout adjustments // perform layout adjustments
let (size, _) = LinkedListAllocator::size_align(layout); let (size, _) = LinkedListAllocator::size_align(layout);
self.inner.lock().add_free_region(ptr as usize, size) self.lock().add_free_region(ptr as usize, size)
} }
} }
``` ```