RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 14:57:35 +00:00
Code Issues Activity Actions

Kernel: Make KBufferBuilder use KBuffer instead of KBufferImpl

Browse source 
This was the last remaining direct client of the KBufferImpl class
outside of KBuffer.
This commit is contained in:
Andreas Kling 2021-09-07 15:44:45 +02:00
parent b300f9aa2f
commit 2c262ddf0f
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Kernel/KBufferBuilder.cpp
View file

@ -21,7 +21,13 @@ inline bool KBufferBuilder::check_expand(size_t size)
if (Checked<size_t>::addition_would_overflow(new_buffer_size, 1 * MiB)) if (Checked<size_t>::addition_would_overflow(new_buffer_size, 1 * MiB))
return false; return false;
new_buffer_size = Memory::page_round_up(new_buffer_size + 1 * MiB); new_buffer_size = Memory::page_round_up(new_buffer_size + 1 * MiB);
return m_buffer->expand(new_buffer_size); auto new_buffer_or_error = KBuffer::try_create_with_size(new_buffer_size);
if (new_buffer_or_error.is_error())
return false;
auto new_buffer = new_buffer_or_error.release_value();
memcpy(new_buffer->data(), m_buffer->data(), m_buffer->size());
m_buffer = move(new_buffer);
return true;
} }
bool KBufferBuilder::flush() bool KBufferBuilder::flush()
@ -37,11 +43,11 @@ OwnPtr<KBuffer> KBufferBuilder::build()
if (!flush()) if (!flush())
return {}; return {};
return try_make<KBuffer>(move(m_buffer)); return move(m_buffer);
} }
KBufferBuilder::KBufferBuilder() KBufferBuilder::KBufferBuilder()
: m_buffer(KBufferImpl::try_create_with_size(4 * MiB, Memory::Region::Access::ReadWrite)) : m_buffer(KBuffer::try_create_with_size(4 * MiB, Memory::Region::Access::ReadWrite).release_value())
{ {
} }

2
Kernel/KBufferBuilder.h
View file

@ -56,7 +56,7 @@ private:
return m_buffer->data() + m_size; return m_buffer->data() + m_size;
} }
RefPtr<KBufferImpl> m_buffer; OwnPtr<KBuffer> m_buffer;
size_t m_size { 0 }; size_t m_size { 0 };
}; };