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

Kernel: Remove KBuffer::is_null() and bogus call sites :^)

Browse source
This commit is contained in:
Andreas Kling 2021-09-07 16:00:39 +02:00
parent 1a04dc9cba
commit 881923dd47
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Kernel/DoubleBuffer.cpp
View file

@ -38,8 +38,6 @@ DoubleBuffer::DoubleBuffer(size_t capacity, NonnullOwnPtr<KBuffer> storage)
void DoubleBuffer::flip() void DoubleBuffer::flip()
{ {
if (m_storage->is_null())
return;
VERIFY(m_read_buffer_index == m_read_buffer->size); VERIFY(m_read_buffer_index == m_read_buffer->size);
swap(m_read_buffer, m_write_buffer); swap(m_read_buffer, m_write_buffer);
m_write_buffer->size = 0; m_write_buffer->size = 0;
@ -49,7 +47,7 @@ void DoubleBuffer::flip()
KResultOr<size_t> DoubleBuffer::write(const UserOrKernelBuffer& data, size_t size) KResultOr<size_t> DoubleBuffer::write(const UserOrKernelBuffer& data, size_t size)
{ {
if (!size || m_storage->is_null()) if (!size)
return 0; return 0;
MutexLocker locker(m_lock); MutexLocker locker(m_lock);
size_t bytes_to_write = min(size, m_space_for_writing); size_t bytes_to_write = min(size, m_space_for_writing);
@ -64,7 +62,7 @@ KResultOr<size_t> DoubleBuffer::write(const UserOrKernelBuffer& data, size_t siz
KResultOr<size_t> DoubleBuffer::read(UserOrKernelBuffer& data, size_t size) KResultOr<size_t> DoubleBuffer::read(UserOrKernelBuffer& data, size_t size)
{ {
if (!size || m_storage->is_null()) if (!size)
return 0; return 0;
MutexLocker locker(m_lock); MutexLocker locker(m_lock);
if (m_read_buffer_index >= m_read_buffer->size && m_write_buffer->size != 0) if (m_read_buffer_index >= m_read_buffer->size && m_write_buffer->size != 0)
@ -82,7 +80,7 @@ KResultOr<size_t> DoubleBuffer::read(UserOrKernelBuffer& data, size_t size)
KResultOr<size_t> DoubleBuffer::peek(UserOrKernelBuffer& data, size_t size) KResultOr<size_t> DoubleBuffer::peek(UserOrKernelBuffer& data, size_t size)
{ {
if (!size || m_storage->is_null()) if (!size)
return 0; return 0;
MutexLocker locker(m_lock); MutexLocker locker(m_lock);
if (m_read_buffer_index >= m_read_buffer->size && m_write_buffer->size != 0) { if (m_read_buffer_index >= m_read_buffer->size && m_write_buffer->size != 0) {

2
Kernel/KBuffer.h
View file

@ -113,8 +113,6 @@ public:
return adopt_nonnull_own_or_enomem(new (nothrow) KBuffer(impl.release_nonnull())); return adopt_nonnull_own_or_enomem(new (nothrow) KBuffer(impl.release_nonnull()));
} }
[[nodiscard]] bool is_null() const { return false; }
[[nodiscard]] u8* data() { return m_impl->data(); } [[nodiscard]] u8* data() { return m_impl->data(); }
[[nodiscard]] const u8* data() const { return m_impl->data(); } [[nodiscard]] const u8* data() const { return m_impl->data(); }
[[nodiscard]] size_t size() const { return m_impl->size(); } [[nodiscard]] size_t size() const { return m_impl->size(); }