TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-09-10 13:04:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup physical allocator

Browse Source
This commit is contained in:
Baptiste Wicht 2018-03-28 13:14:34 +02:00
parent 78743ff188
commit e452367970
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/src/physical_allocator.cpp
View File

@ -129,7 +129,7 @@ void physical_allocator::init(){
auto size = current_mmap_entry->size; auto size = current_mmap_entry->size;
auto managed_space = size - (current_mmap_entry_position - current_mmap_entry->base); auto managed_space = size - (current_mmap_entry_position - current_mmap_entry->base);
logging::logf(logging::log_level::TRACE, "palloc: Managed space %h\n", size_t(managed_space)); logging::logf(logging::log_level::TRACE, "palloc: Managed space %m\n", size_t(managed_space));
auto data_bitmap_1 = create_array(managed_space, 1); auto data_bitmap_1 = create_array(managed_space, 1);
auto data_bitmap_2 = create_array(managed_space, 2); auto data_bitmap_2 = create_array(managed_space, 2);
@ -184,7 +184,7 @@ void physical_allocator::finalize(){
} }
size_t physical_allocator::allocate(size_t blocks){ size_t physical_allocator::allocate(size_t blocks){
thor_assert(blocks < free() / paging::PAGE_SIZE, "Not enough physical memory"); thor_assert(blocks * paging::PAGE_SIZE < free(), "Not enough physical memory");
allocated_memory += buddy_type::level_size(blocks) * unit; allocated_memory += buddy_type::level_size(blocks) * unit;