Skip to content

Commit

Permalink
Kernel: Use operator ""sv in all class_name() implementations
Browse files Browse the repository at this point in the history
Previously there was a mix of returning plain strings and returning
explicit string views using `operator ""sv`. This change switches them
all to standardized on `operator ""sv` as it avoids a call to strlen.
  • Loading branch information
bgianfo authored and awesomekling committed Oct 3, 2021
1 parent 836c22e commit 5f1c98e
Show file tree
Hide file tree
Showing 39 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion Kernel/Bus/VirtIO/Console.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Console
virtual void initialize() override;

private:
virtual StringView class_name() const override { return "VirtIOConsole"; }
virtual StringView class_name() const override { return "VirtIOConsole"sv; }
explicit Console(PCI::DeviceIdentifier const&);
enum class ControlEvent : u16 {
DeviceReady = 0,
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Bus/VirtIO/ConsolePort.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class ConsolePort
private:
constexpr static size_t RINGBUFFER_SIZE = 2 * PAGE_SIZE;

virtual StringView class_name() const override { return "VirtIOConsolePort"; }
virtual StringView class_name() const override { return "VirtIOConsolePort"sv; }

virtual bool can_read(const OpenFileDescription&, size_t) const override;
virtual KResultOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override;
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Bus/VirtIO/Device.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class Device
virtual void initialize();

protected:
virtual StringView class_name() const { return "VirtIO::Device"; }
virtual StringView class_name() const { return "VirtIO::Device"sv; }
explicit Device(PCI::DeviceIdentifier const&);
struct MappedMMIO {
OwnPtr<Memory::Region> base;
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Bus/VirtIO/RNG.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class RNG final
virtual void initialize() override;

private:
virtual StringView class_name() const override { return "VirtIOConsole"; }
virtual StringView class_name() const override { return "VirtIOConsole"sv; }
explicit RNG(PCI::DeviceIdentifier const&);
virtual bool handle_device_config_change() override;
virtual void handle_queue_update(u16 queue_index) override;
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Devices/ConsoleDevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ConsoleDevice final : public CharacterDevice {
virtual bool can_write(const Kernel::OpenFileDescription&, size_t) const override { return true; }
virtual Kernel::KResultOr<size_t> read(OpenFileDescription&, u64, Kernel::UserOrKernelBuffer&, size_t) override;
virtual Kernel::KResultOr<size_t> write(OpenFileDescription&, u64, const Kernel::UserOrKernelBuffer&, size_t) override;
virtual StringView class_name() const override { return "Console"; }
virtual StringView class_name() const override { return "Console"sv; }

void put_char(char);

Expand Down
2 changes: 1 addition & 1 deletion Kernel/Devices/FullDevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class FullDevice final : public CharacterDevice {
virtual KResultOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override;
virtual bool can_read(const OpenFileDescription&, size_t) const override;
virtual bool can_write(const OpenFileDescription&, size_t) const override { return true; }
virtual StringView class_name() const override { return "FullDevice"; }
virtual StringView class_name() const override { return "FullDevice"sv; }
};

}
2 changes: 1 addition & 1 deletion Kernel/Devices/HID/KeyboardDevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class KeyboardDevice : public HIDDevice {
mutable Spinlock m_queue_lock;
CircularQueue<Event, 16> m_queue;
// ^CharacterDevice
virtual StringView class_name() const override { return "KeyboardDevice"; }
virtual StringView class_name() const override { return "KeyboardDevice"sv; }

u8 m_modifiers { 0 };
bool m_caps_lock_to_ctrl_pressed { false };
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Devices/HID/MouseDevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class MouseDevice : public HIDDevice {
protected:
MouseDevice();
// ^CharacterDevice
virtual StringView class_name() const override { return "MouseDevice"; }
virtual StringView class_name() const override { return "MouseDevice"sv; }

mutable Spinlock m_queue_lock;
CircularQueue<MousePacket, 100> m_queue;
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Devices/HID/PS2KeyboardDevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class PS2KeyboardDevice final : public IRQHandler
virtual bool handle_irq(const RegisterState&) override;

// ^CharacterDevice
virtual StringView class_name() const override { return "KeyboardDevice"; }
virtual StringView class_name() const override { return "KeyboardDevice"sv; }
};

}
2 changes: 1 addition & 1 deletion Kernel/Devices/KCOVDevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class KCOVDevice final : public BlockDevice {
protected:
KCOVDevice();

virtual StringView class_name() const override { return "KCOVDevice"; }
virtual StringView class_name() const override { return "KCOVDevice"sv; }

virtual bool can_read(const OpenFileDescription&, size_t) const override final { return true; }
virtual bool can_write(const OpenFileDescription&, size_t) const override final { return true; }
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Devices/MemoryDevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class MemoryDevice final : public CharacterDevice {
private:
MemoryDevice();

virtual StringView class_name() const override { return "MemoryDevice"; }
virtual StringView class_name() const override { return "MemoryDevice"sv; }
virtual bool can_read(const OpenFileDescription&, size_t) const override { return true; }
virtual bool can_write(const OpenFileDescription&, size_t) const override { return false; }
virtual bool is_seekable() const override { return true; }
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Devices/NullDevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class NullDevice final : public CharacterDevice {
virtual KResultOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override;
virtual bool can_write(const OpenFileDescription&, size_t) const override { return true; }
virtual bool can_read(const OpenFileDescription&, size_t) const override;
virtual StringView class_name() const override { return "NullDevice"; }
virtual StringView class_name() const override { return "NullDevice"sv; }
virtual bool is_seekable() const override { return true; }
};

Expand Down
2 changes: 1 addition & 1 deletion Kernel/Devices/RandomDevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class RandomDevice final : public CharacterDevice {
virtual KResultOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override;
virtual bool can_read(const OpenFileDescription&, size_t) const override;
virtual bool can_write(const OpenFileDescription&, size_t) const override { return true; }
virtual StringView class_name() const override { return "RandomDevice"; }
virtual StringView class_name() const override { return "RandomDevice"sv; }
};

}
2 changes: 1 addition & 1 deletion Kernel/Devices/SB16.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class SB16 final : public IRQHandler
virtual bool handle_irq(const RegisterState&) override;

// ^CharacterDevice
virtual StringView class_name() const override { return "SB16"; }
virtual StringView class_name() const override { return "SB16"sv; }

void initialize();
void wait_for_irq();
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Devices/SerialDevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class SerialDevice final : public CharacterDevice {
friend class PCISerialDevice;

// ^CharacterDevice
virtual StringView class_name() const override { return "SerialDevice"; }
virtual StringView class_name() const override { return "SerialDevice"sv; }

void initialize();
void set_interrupts(bool interrupt_enable);
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Devices/ZeroDevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ZeroDevice final : public CharacterDevice {
virtual KResultOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override;
virtual bool can_read(const OpenFileDescription&, size_t) const override;
virtual bool can_write(const OpenFileDescription&, size_t) const override { return true; }
virtual StringView class_name() const override { return "ZeroDevice"; }
virtual StringView class_name() const override { return "ZeroDevice"sv; }
};

}
2 changes: 1 addition & 1 deletion Kernel/FileSystem/AnonymousFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class AnonymousFile final : public File {
virtual KResultOr<Memory::Region*> mmap(Process&, OpenFileDescription&, Memory::VirtualRange const&, u64 offset, int prot, bool shared) override;

private:
virtual StringView class_name() const override { return "AnonymousFile"; }
virtual StringView class_name() const override { return "AnonymousFile"sv; }
virtual String absolute_path(const OpenFileDescription&) const override { return ":anonymous-file:"; }
virtual bool can_read(const OpenFileDescription&, size_t) const override { return false; }
virtual bool can_write(const OpenFileDescription&, size_t) const override { return false; }
Expand Down
2 changes: 1 addition & 1 deletion Kernel/FileSystem/FIFO.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class FIFO final : public File {
virtual bool can_read(const OpenFileDescription&, size_t) const override;
virtual bool can_write(const OpenFileDescription&, size_t) const override;
virtual String absolute_path(const OpenFileDescription&) const override;
virtual StringView class_name() const override { return "FIFO"; }
virtual StringView class_name() const override { return "FIFO"sv; }
virtual bool is_fifo() const override { return true; }

explicit FIFO(UserID, NonnullOwnPtr<DoubleBuffer> buffer);
Expand Down
2 changes: 1 addition & 1 deletion Kernel/FileSystem/ISO9660FileSystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ class ISO9660FS final : public BlockBasedFileSystem {

virtual ~ISO9660FS() override;
virtual KResult initialize() override;
virtual StringView class_name() const override { return "ISO9660FS"; }
virtual StringView class_name() const override { return "ISO9660FS"sv; }
virtual Inode& root_inode() override;

virtual unsigned total_block_count() const override;
Expand Down
2 changes: 1 addition & 1 deletion Kernel/FileSystem/InodeFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class InodeFile final : public File {
virtual KResult chown(OpenFileDescription&, UserID, GroupID) override;
virtual KResult chmod(OpenFileDescription&, mode_t) override;

virtual StringView class_name() const override { return "InodeFile"; }
virtual StringView class_name() const override { return "InodeFile"sv; }

virtual bool is_seekable() const override { return true; }
virtual bool is_inode() const override { return true; }
Expand Down
2 changes: 1 addition & 1 deletion Kernel/FileSystem/InodeWatcher.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class InodeWatcher final : public File {
virtual KResult close() override;

virtual String absolute_path(const OpenFileDescription&) const override;
virtual StringView class_name() const override { return "InodeWatcher"; };
virtual StringView class_name() const override { return "InodeWatcher"sv; };
virtual bool is_inode_watcher() const override { return true; }

void notify_inode_event(Badge<Inode>, InodeIdentifier, InodeWatcherEvent::Type, String const& name = {});
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Graphics/FramebufferDevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class FramebufferDevice : public BlockDevice {
FramebufferDevice(const GraphicsDevice&, size_t, PhysicalAddress, size_t, size_t, size_t);

// ^File
virtual StringView class_name() const override { return "FramebufferDevice"; }
virtual StringView class_name() const override { return "FramebufferDevice"sv; }

virtual bool can_read(const OpenFileDescription&, size_t) const override final { return true; }
virtual bool can_write(const OpenFileDescription&, size_t) const override final { return true; }
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Graphics/VirtIOGPU/FrameBufferDevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class FrameBufferDevice final : public BlockDevice {
u8* framebuffer_data();

private:
virtual StringView class_name() const override { return "VirtIOFrameBuffer"; }
virtual StringView class_name() const override { return "VirtIOFrameBuffer"sv; }

Protocol::DisplayInfoResponse::Display const& display_info() const;
Protocol::DisplayInfoResponse::Display& display_info();
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Graphics/VirtIOGPU/GPU.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class GPU final
void flush_dirty_rectangle(ScanoutID, Protocol::Rect const& dirty_rect, ResourceID);

private:
virtual StringView class_name() const override { return "VirtIOGPU"; }
virtual StringView class_name() const override { return "VirtIOGPU"sv; }

struct Scanout {
RefPtr<FrameBufferDevice> framebuffer;
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Net/IPv4Socket.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class IPv4Socket : public Socket {

protected:
IPv4Socket(int type, int protocol, NonnullOwnPtr<DoubleBuffer> receive_buffer, OwnPtr<KBuffer> optional_scratch_buffer);
virtual StringView class_name() const override { return "IPv4Socket"; }
virtual StringView class_name() const override { return "IPv4Socket"sv; }

PortAllocationResult allocate_local_port_if_needed();

Expand Down
2 changes: 1 addition & 1 deletion Kernel/Net/LocalSocket.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class LocalSocket final : public Socket {

private:
explicit LocalSocket(int type, NonnullOwnPtr<DoubleBuffer> client_buffer, NonnullOwnPtr<DoubleBuffer> server_buffer);
virtual StringView class_name() const override { return "LocalSocket"; }
virtual StringView class_name() const override { return "LocalSocket"sv; }
virtual bool is_local() const override { return true; }
bool has_attached_peer(const OpenFileDescription&) const;
DoubleBuffer* receive_buffer_for(OpenFileDescription&);
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Net/LoopbackAdapter.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class LoopbackAdapter final : public NetworkAdapter {
virtual ~LoopbackAdapter() override;

virtual void send_raw(ReadonlyBytes) override;
virtual StringView class_name() const override { return "LoopbackAdapter"; }
virtual StringView class_name() const override { return "LoopbackAdapter"sv; }
virtual bool link_up() override { return true; }
virtual bool link_full_duplex() override { return true; }
virtual int link_speed() override { return 1000; }
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Net/Socket.h
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class Socket : public File {
size_t backlog() const { return m_backlog; }
void set_backlog(size_t backlog) { m_backlog = backlog; }

virtual StringView class_name() const override { return "Socket"; }
virtual StringView class_name() const override { return "Socket"sv; }

virtual void shut_down_for_reading() { }
virtual void shut_down_for_writing() { }
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Net/TCPSocket.h
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ class TCPSocket final : public IPv4Socket {

private:
explicit TCPSocket(int protocol, NonnullOwnPtr<DoubleBuffer> receive_buffer, NonnullOwnPtr<KBuffer> scratch_buffer);
virtual StringView class_name() const override { return "TCPSocket"; }
virtual StringView class_name() const override { return "TCPSocket"sv; }

virtual void shut_down_for_writing() override;

Expand Down
2 changes: 1 addition & 1 deletion Kernel/Net/UDPSocket.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class UDPSocket final : public IPv4Socket {

private:
explicit UDPSocket(int protocol, NonnullOwnPtr<DoubleBuffer> receive_buffer);
virtual StringView class_name() const override { return "UDPSocket"; }
virtual StringView class_name() const override { return "UDPSocket"sv; }
static MutexProtected<HashMap<u16, UDPSocket*>>& sockets_by_port();

virtual KResultOr<size_t> protocol_receive(ReadonlyBytes raw_ipv4_packet, UserOrKernelBuffer& buffer, size_t buffer_size, int flags) override;
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Storage/PATADiskDevice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ UNMAP_AFTER_INIT PATADiskDevice::~PATADiskDevice()

StringView PATADiskDevice::class_name() const
{
return "PATADiskDevice";
return "PATADiskDevice"sv;
}

void PATADiskDevice::start_request(AsyncBlockDeviceRequest& request)
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Storage/Partition/DiskPartition.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ bool DiskPartition::can_write(const OpenFileDescription& fd, size_t offset) cons

StringView DiskPartition::class_name() const
{
return "DiskPartition";
return "DiskPartition"sv;
}

}
2 changes: 1 addition & 1 deletion Kernel/Storage/RamdiskDevice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RamdiskDevice::~RamdiskDevice()

StringView RamdiskDevice::class_name() const
{
return "RamdiskDevice";
return "RamdiskDevice"sv;
}

void RamdiskDevice::start_request(AsyncBlockDeviceRequest& request)
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Storage/SATADiskDevice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ SATADiskDevice::~SATADiskDevice()

StringView SATADiskDevice::class_name() const
{
return "SATADiskDevice";
return "SATADiskDevice"sv;
}

void SATADiskDevice::start_request(AsyncBlockDeviceRequest& request)
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Storage/StorageDevice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ StorageDevice::StorageDevice(const StorageController& controller, int major, int

StringView StorageDevice::class_name() const
{
return "StorageDevice";
return "StorageDevice"sv;
}

NonnullRefPtr<StorageController> StorageDevice::controller() const
Expand Down
2 changes: 1 addition & 1 deletion Kernel/TTY/MasterPTY.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class MasterPTY final : public CharacterDevice {
virtual KResult close() override;
virtual bool is_master_pty() const override { return true; }
virtual KResult ioctl(OpenFileDescription&, unsigned request, Userspace<void*> arg) override;
virtual StringView class_name() const override { return "MasterPTY"; }
virtual StringView class_name() const override { return "MasterPTY"sv; }

RefPtr<SlavePTY> m_slave;
unsigned m_index;
Expand Down
2 changes: 1 addition & 1 deletion Kernel/TTY/PTYMultiplexer.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class PTYMultiplexer final : public CharacterDevice {

private:
// ^CharacterDevice
virtual StringView class_name() const override { return "PTYMultiplexer"; }
virtual StringView class_name() const override { return "PTYMultiplexer"sv; }

static constexpr size_t max_pty_pairs = 64;
MutexProtected<Vector<unsigned, max_pty_pairs>> m_freelist;
Expand Down
2 changes: 1 addition & 1 deletion Kernel/TTY/SlavePTY.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class SlavePTY final : public TTY {
virtual bool can_read(const OpenFileDescription&, size_t) const override;
virtual KResultOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override;
virtual bool can_write(const OpenFileDescription&, size_t) const override;
virtual StringView class_name() const override { return "SlavePTY"; }
virtual StringView class_name() const override { return "SlavePTY"sv; }
virtual KResult close() override;

friend class MasterPTY;
Expand Down
2 changes: 1 addition & 1 deletion Kernel/TTY/VirtualConsole.h
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ class VirtualConsole final : public TTY
virtual void set_cursor_style(VT::CursorStyle) override;

// ^CharacterDevice
virtual StringView class_name() const override { return "VirtualConsole"; }
virtual StringView class_name() const override { return "VirtualConsole"sv; }

void set_active(bool);
void flush_dirty_lines();
Expand Down

0 comments on commit 5f1c98e

Please sign in to comment.