RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 04:27:45 +00:00
Code Issues Activity Actions

Kernel: Remove krealloc()

Browse source 
This was only used by a single class (AK::ByteBuffer) in the kernel
and not in an OOM-safe way.

Now that ByteBuffer no longer uses it, there's no need for the kernel
heap to burden itself with supporting this.
This commit is contained in:
Andreas Kling 2021-07-11 14:03:53 +02:00
parent 966880eb45
commit 25e850ebb1
4 changed files with 0 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Kernel/Heap/Heap.h
View file

@ -118,34 +118,6 @@ public:
}
}
template<typename MainHeap>
void* reallocate(void* ptr, size_t new_size, MainHeap& h)
{
if (!ptr)
return h.allocate(new_size);
auto* a = allocation_header(ptr);
VERIFY((u8*)a >= m_chunks && (u8*)ptr < m_chunks + m_total_chunks * CHUNK_SIZE);
VERIFY((u8*)a + a->allocation_size_in_chunks * CHUNK_SIZE <= m_chunks + m_total_chunks * CHUNK_SIZE);
size_t old_size = a->allocation_size_in_chunks * CHUNK_SIZE - sizeof(AllocationHeader);
if (old_size == new_size)
return ptr;
auto* new_ptr = h.allocate(new_size);
if (new_ptr) {
__builtin_memcpy(new_ptr, ptr, min(old_size, new_size));
deallocate(ptr);
}
return new_ptr;
}
void* reallocate(void* ptr, size_t new_size)
{
return reallocate(ptr, new_size, *this);
}
bool contains(const void* ptr) const
{
const auto* a = allocation_header(ptr);
@ -319,17 +291,6 @@ public:
VERIFY_NOT_REACHED();
}
void* reallocate(void* ptr, size_t new_size)
{
if (!ptr)
return allocate(new_size);
for (auto* subheap = &m_heaps; subheap; subheap = subheap->next) {
if (subheap->heap.contains(ptr))
return subheap->heap.reallocate(ptr, new_size, *this);
}
VERIFY_NOT_REACHED();
}
HeapType& add_subheap(void* memory, size_t memory_size)
{
VERIFY(memory_size > sizeof(SubHeap));