justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[kernel] Remove last of old allocator interface

Browse Source 
Removing the `allocator.h` file defining the `kutil::allocator`
interface, now that explicit allocators are not being passed around.
Also removed the unused `frame_allocator::raw_allocator` class and
`kutil::invalid_allocator` object.

Tags: memory
This commit is contained in:
Justin C. Miller
2020-06-01 23:40:19 -07:00
parent a5f72edf82
commit b881b2639d
8 changed files with 5 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/kernel/frame_allocator.cpp
View File

@@ -1,3 +1,4 @@
#include "kernel_memory.h"
#include "kutil/assert.h"
#include "kutil/memory.h"
#include "frame_allocator.h"
@@ -17,30 +18,7 @@ frame_block::compare(const frame_block *rhs) const
}
frame_allocator::raw_alloc::raw_alloc(frame_allocator &fa) : m_fa(fa) {}
void *
frame_allocator::raw_alloc::allocate(size_t size)
{
kassert(size <= frame_size, "Raw allocator only allocates a single page");
uintptr_t addr = 0;
if (size <= frame_size)
m_fa.allocate(1, &addr);
return reinterpret_cast<void*>(addr + page_offset);
}
void
frame_allocator::raw_alloc::free(void *p)
{
m_fa.free(reinterpret_cast<uintptr_t>(p), 1);
}
frame_allocator::frame_allocator() :
m_raw_alloc(*this)
{
}
frame_allocator::frame_allocator() {}
size_t
frame_allocator::allocate(size_t count, uintptr_t *address)