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

Kernel: Use StringView instead of String in RingBuffer's constructor

Browse source 
This String was being copied into a KString internally anyways.
This commit is contained in:
Idan Horowitz 2022-01-12 23:57:45 +02:00 • committed by Brian Gianforcaro
parent 792b8ca13c
commit 618f123463
4 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/Bus/VirtIO/Console.cpp
View file

@ -123,8 +123,8 @@ void Console::handle_queue_update(u16 queue_index)
void Console::setup_multiport() void Console::setup_multiport()
{ {
m_control_receive_buffer = make<Memory::RingBuffer>("VirtIOConsole control receive queue", CONTROL_BUFFER_SIZE); m_control_receive_buffer = make<Memory::RingBuffer>("VirtIOConsole control receive queue"sv, CONTROL_BUFFER_SIZE);
m_control_transmit_buffer = make<Memory::RingBuffer>("VirtIOConsole control transmit queue", CONTROL_BUFFER_SIZE); m_control_transmit_buffer = make<Memory::RingBuffer>("VirtIOConsole control transmit queue"sv, CONTROL_BUFFER_SIZE);
auto& queue = get_queue(CONTROL_RECEIVEQ); auto& queue = get_queue(CONTROL_RECEIVEQ);
SpinlockLocker queue_lock(queue.lock()); SpinlockLocker queue_lock(queue.lock());

4
Kernel/Bus/VirtIO/ConsolePort.cpp
View file

@ -17,8 +17,8 @@ ConsolePort::ConsolePort(unsigned port, VirtIO::Console& console)
, m_console(console) , m_console(console)
, m_port(port) , m_port(port)
{ {
m_receive_buffer = make<Memory::RingBuffer>("VirtIO::ConsolePort Receive", RINGBUFFER_SIZE); m_receive_buffer = make<Memory::RingBuffer>("VirtIO::ConsolePort Receive"sv, RINGBUFFER_SIZE);
m_transmit_buffer = make<Memory::RingBuffer>("VirtIO::ConsolePort Transmit", RINGBUFFER_SIZE); m_transmit_buffer = make<Memory::RingBuffer>("VirtIO::ConsolePort Transmit"sv, RINGBUFFER_SIZE);
m_receive_queue = m_port == 0 ? 0 : m_port * 2 + 2; m_receive_queue = m_port == 0 ? 0 : m_port * 2 + 2;
m_transmit_queue = m_port == 0 ? 1 : m_port * 2 + 3; m_transmit_queue = m_port == 0 ? 1 : m_port * 2 + 3;
} }

4
Kernel/Memory/RingBuffer.cpp
View file

@ -10,8 +10,8 @@
namespace Kernel::Memory { namespace Kernel::Memory {
RingBuffer::RingBuffer(String region_name, size_t capacity) RingBuffer::RingBuffer(StringView region_name, size_t capacity)
: m_region(MM.allocate_contiguous_kernel_region(page_round_up(capacity).release_value_but_fixme_should_propagate_errors(), move(region_name), Region::Access::Read | Region::Access::Write).release_value()) : m_region(MM.allocate_contiguous_kernel_region(page_round_up(capacity).release_value_but_fixme_should_propagate_errors(), region_name, Region::Access::Read | Region::Access::Write).release_value())
, m_capacity_in_bytes(capacity) , m_capacity_in_bytes(capacity)
{ {
} }

3
Kernel/Memory/RingBuffer.h
View file

@ -6,7 +6,6 @@
#pragma once #pragma once
#include <AK/String.h>
#include <Kernel/PhysicalAddress.h> #include <Kernel/PhysicalAddress.h>
#include <Kernel/UserOrKernelBuffer.h> #include <Kernel/UserOrKernelBuffer.h>
@ -14,7 +13,7 @@ namespace Kernel::Memory {
class RingBuffer { class RingBuffer {
public: public:
RingBuffer(String region_name, size_t capacity); RingBuffer(StringView region_name, size_t capacity);
bool has_space() const { return m_num_used_bytes < m_capacity_in_bytes; } bool has_space() const { return m_num_used_bytes < m_capacity_in_bytes; }
bool copy_data_in(const UserOrKernelBuffer& buffer, size_t offset, size_t length, PhysicalAddress& start_of_copied_data, size_t& bytes_copied); bool copy_data_in(const UserOrKernelBuffer& buffer, size_t offset, size_t length, PhysicalAddress& start_of_copied_data, size_t& bytes_copied);