diff options
author | Idan Horowitz <idan.horowitz@gmail.com> | 2022-01-12 23:57:45 +0200 |
---|---|---|
committer | Brian Gianforcaro <b.gianfo@gmail.com> | 2022-01-13 00:20:08 -0800 |
commit | 618f1234636bb668b0eab39b9ec7d88660c1cca1 (patch) | |
tree | 156a2a5abed9a7a5589e307575147298fcf78a91 /Kernel | |
parent | 792b8ca13ca13e6ea5dfa51280ce5c83164fd656 (diff) | |
download | serenity-618f1234636bb668b0eab39b9ec7d88660c1cca1.zip |
Kernel: Use StringView instead of String in RingBuffer's constructor
This String was being copied into a KString internally anyways.
Diffstat (limited to 'Kernel')
-rw-r--r-- | Kernel/Bus/VirtIO/Console.cpp | 4 | ||||
-rw-r--r-- | Kernel/Bus/VirtIO/ConsolePort.cpp | 4 | ||||
-rw-r--r-- | Kernel/Memory/RingBuffer.cpp | 4 | ||||
-rw-r--r-- | Kernel/Memory/RingBuffer.h | 3 |
4 files changed, 7 insertions, 8 deletions
diff --git a/Kernel/Bus/VirtIO/Console.cpp b/Kernel/Bus/VirtIO/Console.cpp index 9c291a0581..de4f2779bc 100644 --- a/Kernel/Bus/VirtIO/Console.cpp +++ b/Kernel/Bus/VirtIO/Console.cpp @@ -123,8 +123,8 @@ void Console::handle_queue_update(u16 queue_index) void Console::setup_multiport() { - m_control_receive_buffer = make<Memory::RingBuffer>("VirtIOConsole control receive queue", CONTROL_BUFFER_SIZE); - m_control_transmit_buffer = make<Memory::RingBuffer>("VirtIOConsole control transmit 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"sv, CONTROL_BUFFER_SIZE); auto& queue = get_queue(CONTROL_RECEIVEQ); SpinlockLocker queue_lock(queue.lock()); diff --git a/Kernel/Bus/VirtIO/ConsolePort.cpp b/Kernel/Bus/VirtIO/ConsolePort.cpp index 7e3bd0792a..78149e2380 100644 --- a/Kernel/Bus/VirtIO/ConsolePort.cpp +++ b/Kernel/Bus/VirtIO/ConsolePort.cpp @@ -17,8 +17,8 @@ ConsolePort::ConsolePort(unsigned port, VirtIO::Console& console) , m_console(console) , m_port(port) { - m_receive_buffer = make<Memory::RingBuffer>("VirtIO::ConsolePort Receive", RINGBUFFER_SIZE); - m_transmit_buffer = make<Memory::RingBuffer>("VirtIO::ConsolePort Transmit", RINGBUFFER_SIZE); + m_receive_buffer = make<Memory::RingBuffer>("VirtIO::ConsolePort Receive"sv, 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_transmit_queue = m_port == 0 ? 1 : m_port * 2 + 3; } diff --git a/Kernel/Memory/RingBuffer.cpp b/Kernel/Memory/RingBuffer.cpp index 782d322fca..388e4ae1fe 100644 --- a/Kernel/Memory/RingBuffer.cpp +++ b/Kernel/Memory/RingBuffer.cpp @@ -10,8 +10,8 @@ namespace Kernel::Memory { -RingBuffer::RingBuffer(String 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()) +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(), region_name, Region::Access::Read | Region::Access::Write).release_value()) , m_capacity_in_bytes(capacity) { } diff --git a/Kernel/Memory/RingBuffer.h b/Kernel/Memory/RingBuffer.h index 7b8889f64a..8151fa2490 100644 --- a/Kernel/Memory/RingBuffer.h +++ b/Kernel/Memory/RingBuffer.h @@ -6,7 +6,6 @@ #pragma once -#include <AK/String.h> #include <Kernel/PhysicalAddress.h> #include <Kernel/UserOrKernelBuffer.h> @@ -14,7 +13,7 @@ namespace Kernel::Memory { class RingBuffer { 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 copy_data_in(const UserOrKernelBuffer& buffer, size_t offset, size_t length, PhysicalAddress& start_of_copied_data, size_t& bytes_copied); |