mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 15:07:45 +00:00
Kernel: static vs non-static constexpr variables
Problem: - `static` variables consume memory and sometimes are less optimizable. - `static const` variables can be `constexpr`, usually. - `static` function-local variables require an initialization check every time the function is run. Solution: - If a global `static` variable is only used in a single function then move it into the function and make it non-`static` and `constexpr`. - Make all global `static` variables `constexpr` instead of `const`. - Change function-local `static const[expr]` variables to be just `constexpr`.
This commit is contained in:
parent
2b64d163cd
commit
5751327195
15 changed files with 30 additions and 37 deletions
|
@ -16,7 +16,7 @@ Atomic<bool> g_caps_lock_remapped_to_ctrl;
|
||||||
static AK::Singleton<HIDManagement> s_the;
|
static AK::Singleton<HIDManagement> s_the;
|
||||||
|
|
||||||
// clang-format off
|
// clang-format off
|
||||||
static const Keyboard::CharacterMapData DEFAULT_CHARACTER_MAP =
|
static constexpr Keyboard::CharacterMapData DEFAULT_CHARACTER_MAP =
|
||||||
{
|
{
|
||||||
.map = {
|
.map = {
|
||||||
0, '\033', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', 0x08,
|
0, '\033', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', 0x08,
|
||||||
|
@ -74,10 +74,6 @@ static const Keyboard::CharacterMapData DEFAULT_CHARACTER_MAP =
|
||||||
};
|
};
|
||||||
// clang-format on
|
// clang-format on
|
||||||
|
|
||||||
KeyboardClient::~KeyboardClient()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t HIDManagement::generate_minor_device_number_for_mouse()
|
size_t HIDManagement::generate_minor_device_number_for_mouse()
|
||||||
{
|
{
|
||||||
// FIXME: Lock this to prevent race conditions with hot-plugging devices!
|
// FIXME: Lock this to prevent race conditions with hot-plugging devices!
|
||||||
|
|
|
@ -60,7 +60,7 @@ private:
|
||||||
|
|
||||||
class KeyboardClient {
|
class KeyboardClient {
|
||||||
public:
|
public:
|
||||||
virtual ~KeyboardClient();
|
virtual ~KeyboardClient() = default;
|
||||||
virtual void on_key_pressed(KeyEvent) = 0;
|
virtual void on_key_pressed(KeyEvent) = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -18,9 +18,7 @@
|
||||||
|
|
||||||
namespace Kernel {
|
namespace Kernel {
|
||||||
|
|
||||||
#define IRQ_KEYBOARD 1
|
static constexpr KeyCode unshifted_key_map[0x80] = {
|
||||||
|
|
||||||
static const KeyCode unshifted_key_map[0x80] = {
|
|
||||||
Key_Invalid,
|
Key_Invalid,
|
||||||
Key_Escape,
|
Key_Escape,
|
||||||
Key_1,
|
Key_1,
|
||||||
|
@ -36,7 +34,7 @@ static const KeyCode unshifted_key_map[0x80] = {
|
||||||
Key_Minus,
|
Key_Minus,
|
||||||
Key_Equal,
|
Key_Equal,
|
||||||
Key_Backspace,
|
Key_Backspace,
|
||||||
Key_Tab, //15
|
Key_Tab, // 15
|
||||||
Key_Q,
|
Key_Q,
|
||||||
Key_W,
|
Key_W,
|
||||||
Key_E,
|
Key_E,
|
||||||
|
@ -117,7 +115,7 @@ static const KeyCode unshifted_key_map[0x80] = {
|
||||||
Key_Menu,
|
Key_Menu,
|
||||||
};
|
};
|
||||||
|
|
||||||
static const KeyCode shifted_key_map[0x100] = {
|
static constexpr KeyCode shifted_key_map[0x100] = {
|
||||||
Key_Invalid,
|
Key_Invalid,
|
||||||
Key_Escape,
|
Key_Escape,
|
||||||
Key_ExclamationPoint,
|
Key_ExclamationPoint,
|
||||||
|
@ -214,8 +212,6 @@ static const KeyCode shifted_key_map[0x100] = {
|
||||||
Key_Menu,
|
Key_Menu,
|
||||||
};
|
};
|
||||||
|
|
||||||
static const KeyCode numpad_key_map[13] = { Key_7, Key_8, Key_9, Key_Invalid, Key_4, Key_5, Key_6, Key_Invalid, Key_1, Key_2, Key_3, Key_0, Key_Comma };
|
|
||||||
|
|
||||||
void KeyboardDevice::key_state_changed(u8 scan_code, bool pressed)
|
void KeyboardDevice::key_state_changed(u8 scan_code, bool pressed)
|
||||||
{
|
{
|
||||||
KeyCode key = (m_modifiers & Mod_Shift) ? shifted_key_map[scan_code] : unshifted_key_map[scan_code];
|
KeyCode key = (m_modifiers & Mod_Shift) ? shifted_key_map[scan_code] : unshifted_key_map[scan_code];
|
||||||
|
@ -226,6 +222,7 @@ void KeyboardDevice::key_state_changed(u8 scan_code, bool pressed)
|
||||||
if (m_num_lock_on && !m_has_e0_prefix) {
|
if (m_num_lock_on && !m_has_e0_prefix) {
|
||||||
if (scan_code >= 0x47 && scan_code <= 0x53) {
|
if (scan_code >= 0x47 && scan_code <= 0x53) {
|
||||||
u8 index = scan_code - 0x47;
|
u8 index = scan_code - 0x47;
|
||||||
|
constexpr KeyCode numpad_key_map[13] = { Key_7, Key_8, Key_9, Key_Invalid, Key_4, Key_5, Key_6, Key_Invalid, Key_1, Key_2, Key_3, Key_0, Key_Comma };
|
||||||
KeyCode newKey = numpad_key_map[index];
|
KeyCode newKey = numpad_key_map[index];
|
||||||
|
|
||||||
if (newKey != Key_Invalid) {
|
if (newKey != Key_Invalid) {
|
||||||
|
|
|
@ -20,9 +20,8 @@
|
||||||
|
|
||||||
namespace Kernel {
|
namespace Kernel {
|
||||||
|
|
||||||
static const size_t max_link_count = 65535;
|
static constexpr size_t max_block_size = 4096;
|
||||||
static const size_t max_block_size = 4096;
|
static constexpr ssize_t max_inline_symlink_length = 60;
|
||||||
static const ssize_t max_inline_symlink_length = 60;
|
|
||||||
|
|
||||||
struct Ext2FSDirectoryEntry {
|
struct Ext2FSDirectoryEntry {
|
||||||
String name;
|
String name;
|
||||||
|
@ -1668,6 +1667,7 @@ KResult Ext2FSInode::increment_link_count()
|
||||||
Locker locker(m_lock);
|
Locker locker(m_lock);
|
||||||
if (fs().is_readonly())
|
if (fs().is_readonly())
|
||||||
return EROFS;
|
return EROFS;
|
||||||
|
constexpr size_t max_link_count = 65535;
|
||||||
if (m_raw_inode.i_links_count == max_link_count)
|
if (m_raw_inode.i_links_count == max_link_count)
|
||||||
return EMLINK;
|
return EMLINK;
|
||||||
++m_raw_inode.i_links_count;
|
++m_raw_inode.i_links_count;
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
|
|
||||||
namespace Kernel {
|
namespace Kernel {
|
||||||
|
|
||||||
static const u32 mepoch = 476763780;
|
static constexpr u32 mepoch = 476763780;
|
||||||
|
|
||||||
class Inode;
|
class Inode;
|
||||||
class FileDescription;
|
class FileDescription;
|
||||||
|
|
|
@ -84,8 +84,8 @@ private:
|
||||||
bool m_use_mmio { false };
|
bool m_use_mmio { false };
|
||||||
EntropySource m_entropy_source;
|
EntropySource m_entropy_source;
|
||||||
|
|
||||||
static const size_t number_of_rx_descriptors = 32;
|
static constexpr size_t number_of_rx_descriptors = 32;
|
||||||
static const size_t number_of_tx_descriptors = 8;
|
static constexpr size_t number_of_tx_descriptors = 8;
|
||||||
|
|
||||||
WaitQueue m_wait_queue;
|
WaitQueue m_wait_queue;
|
||||||
};
|
};
|
||||||
|
|
|
@ -137,7 +137,7 @@ struct [[gnu::packed]] received_packet_header {
|
||||||
|
|
||||||
UNMAP_AFTER_INIT void NE2000NetworkAdapter::detect()
|
UNMAP_AFTER_INIT void NE2000NetworkAdapter::detect()
|
||||||
{
|
{
|
||||||
static const auto ne2k_ids = Array<PCI::ID, 11> {
|
constexpr auto ne2k_ids = Array {
|
||||||
PCI::ID { 0x10EC, 0x8029 }, // RealTek RTL-8029(AS)
|
PCI::ID { 0x10EC, 0x8029 }, // RealTek RTL-8029(AS)
|
||||||
|
|
||||||
// List of clones, taken from Linux's ne2k-pci.c
|
// List of clones, taken from Linux's ne2k-pci.c
|
||||||
|
|
|
@ -107,7 +107,7 @@ namespace Kernel {
|
||||||
|
|
||||||
UNMAP_AFTER_INIT void RTL8139NetworkAdapter::detect()
|
UNMAP_AFTER_INIT void RTL8139NetworkAdapter::detect()
|
||||||
{
|
{
|
||||||
static const PCI::ID rtl8139_id = { 0x10EC, 0x8139 };
|
constexpr PCI::ID rtl8139_id = { 0x10EC, 0x8139 };
|
||||||
PCI::enumerate([&](const PCI::Address& address, PCI::ID id) {
|
PCI::enumerate([&](const PCI::Address& address, PCI::ID id) {
|
||||||
if (address.is_null())
|
if (address.is_null())
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -404,9 +404,9 @@ KResult TCPSocket::protocol_connect(FileDescription& description, ShouldBlock sh
|
||||||
|
|
||||||
KResultOr<u16> TCPSocket::protocol_allocate_local_port()
|
KResultOr<u16> TCPSocket::protocol_allocate_local_port()
|
||||||
{
|
{
|
||||||
static const u16 first_ephemeral_port = 32768;
|
constexpr u16 first_ephemeral_port = 32768;
|
||||||
static const u16 last_ephemeral_port = 60999;
|
constexpr u16 last_ephemeral_port = 60999;
|
||||||
static const u16 ephemeral_port_range_size = last_ephemeral_port - first_ephemeral_port;
|
constexpr u16 ephemeral_port_range_size = last_ephemeral_port - first_ephemeral_port;
|
||||||
u16 first_scan_port = first_ephemeral_port + get_good_random<u16>() % ephemeral_port_range_size;
|
u16 first_scan_port = first_ephemeral_port + get_good_random<u16>() % ephemeral_port_range_size;
|
||||||
|
|
||||||
Locker locker(sockets_by_tuple().lock());
|
Locker locker(sockets_by_tuple().lock());
|
||||||
|
|
|
@ -103,9 +103,9 @@ KResult UDPSocket::protocol_connect(FileDescription&, ShouldBlock)
|
||||||
|
|
||||||
KResultOr<u16> UDPSocket::protocol_allocate_local_port()
|
KResultOr<u16> UDPSocket::protocol_allocate_local_port()
|
||||||
{
|
{
|
||||||
static const u16 first_ephemeral_port = 32768;
|
constexpr u16 first_ephemeral_port = 32768;
|
||||||
static const u16 last_ephemeral_port = 60999;
|
constexpr u16 last_ephemeral_port = 60999;
|
||||||
static const u16 ephemeral_port_range_size = last_ephemeral_port - first_ephemeral_port;
|
constexpr u16 ephemeral_port_range_size = last_ephemeral_port - first_ephemeral_port;
|
||||||
u16 first_scan_port = first_ephemeral_port + get_good_random<u16>() % ephemeral_port_range_size;
|
u16 first_scan_port = first_ephemeral_port + get_good_random<u16>() % ephemeral_port_range_size;
|
||||||
|
|
||||||
Locker locker(sockets_by_port().lock());
|
Locker locker(sockets_by_port().lock());
|
||||||
|
|
|
@ -576,7 +576,7 @@ private:
|
||||||
|
|
||||||
OwnPtr<ThreadTracer> m_tracer;
|
OwnPtr<ThreadTracer> m_tracer;
|
||||||
|
|
||||||
static const int m_max_open_file_descriptors { FD_SETSIZE };
|
static constexpr int m_max_open_file_descriptors { FD_SETSIZE };
|
||||||
|
|
||||||
class FileDescriptionAndFlags {
|
class FileDescriptionAndFlags {
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
|
|
||||||
namespace Kernel {
|
namespace Kernel {
|
||||||
|
|
||||||
static const unsigned s_max_pty_pairs = 8;
|
|
||||||
static AK::Singleton<PTYMultiplexer> s_the;
|
static AK::Singleton<PTYMultiplexer> s_the;
|
||||||
|
|
||||||
PTYMultiplexer& PTYMultiplexer::the()
|
PTYMultiplexer& PTYMultiplexer::the()
|
||||||
|
@ -25,8 +24,9 @@ PTYMultiplexer& PTYMultiplexer::the()
|
||||||
UNMAP_AFTER_INIT PTYMultiplexer::PTYMultiplexer()
|
UNMAP_AFTER_INIT PTYMultiplexer::PTYMultiplexer()
|
||||||
: CharacterDevice(5, 2)
|
: CharacterDevice(5, 2)
|
||||||
{
|
{
|
||||||
m_freelist.ensure_capacity(s_max_pty_pairs);
|
constexpr unsigned max_pty_pairs = 8;
|
||||||
for (int i = s_max_pty_pairs; i > 0; --i)
|
m_freelist.ensure_capacity(max_pty_pairs);
|
||||||
|
for (int i = max_pty_pairs; i > 0; --i)
|
||||||
m_freelist.unchecked_append(i - 1);
|
m_freelist.unchecked_append(i - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -127,7 +127,7 @@ void __ubsan_handle_out_of_bounds(const OutOfBoundsData& data, ValueHandle)
|
||||||
void __ubsan_handle_type_mismatch_v1(const TypeMismatchData&, ValueHandle) __attribute__((used));
|
void __ubsan_handle_type_mismatch_v1(const TypeMismatchData&, ValueHandle) __attribute__((used));
|
||||||
void __ubsan_handle_type_mismatch_v1(const TypeMismatchData& data, ValueHandle ptr)
|
void __ubsan_handle_type_mismatch_v1(const TypeMismatchData& data, ValueHandle ptr)
|
||||||
{
|
{
|
||||||
static const char* kinds[] = {
|
constexpr StringView kinds[] = {
|
||||||
"load of",
|
"load of",
|
||||||
"store to",
|
"store to",
|
||||||
"reference binding to",
|
"reference binding to",
|
||||||
|
@ -143,7 +143,7 @@ void __ubsan_handle_type_mismatch_v1(const TypeMismatchData& data, ValueHandle p
|
||||||
};
|
};
|
||||||
|
|
||||||
FlatPtr alignment = (FlatPtr)1 << data.log_alignment;
|
FlatPtr alignment = (FlatPtr)1 << data.log_alignment;
|
||||||
auto* kind = kinds[data.type_check_kind];
|
auto kind = kinds[data.type_check_kind];
|
||||||
|
|
||||||
if (!ptr) {
|
if (!ptr) {
|
||||||
dbgln("KUBSAN: {} null pointer of type {}", kind, data.type.name());
|
dbgln("KUBSAN: {} null pointer of type {}", kind, data.type.name());
|
||||||
|
|
|
@ -54,7 +54,7 @@ enum class UsedMemoryRangeType {
|
||||||
BootModule,
|
BootModule,
|
||||||
};
|
};
|
||||||
|
|
||||||
constexpr static const char* UserMemoryRangeTypeNames[] {
|
static constexpr StringView UserMemoryRangeTypeNames[] {
|
||||||
"Low memory",
|
"Low memory",
|
||||||
"Kernel",
|
"Kernel",
|
||||||
"Boot module",
|
"Boot module",
|
||||||
|
|
|
@ -13,9 +13,6 @@
|
||||||
|
|
||||||
namespace Kernel {
|
namespace Kernel {
|
||||||
|
|
||||||
static const FlatPtr userspace_range_base = 0x00800000;
|
|
||||||
static const FlatPtr userspace_range_ceiling = 0xbe000000;
|
|
||||||
|
|
||||||
static AK::Singleton<HashMap<u32, PageDirectory*>> s_cr3_map;
|
static AK::Singleton<HashMap<u32, PageDirectory*>> s_cr3_map;
|
||||||
|
|
||||||
static HashMap<u32, PageDirectory*>& cr3_map()
|
static HashMap<u32, PageDirectory*>& cr3_map()
|
||||||
|
@ -53,6 +50,9 @@ UNMAP_AFTER_INIT PageDirectory::PageDirectory()
|
||||||
|
|
||||||
PageDirectory::PageDirectory(const RangeAllocator* parent_range_allocator)
|
PageDirectory::PageDirectory(const RangeAllocator* parent_range_allocator)
|
||||||
{
|
{
|
||||||
|
constexpr FlatPtr userspace_range_base = 0x00800000;
|
||||||
|
constexpr FlatPtr userspace_range_ceiling = 0xbe000000;
|
||||||
|
|
||||||
ScopedSpinLock lock(s_mm_lock);
|
ScopedSpinLock lock(s_mm_lock);
|
||||||
if (parent_range_allocator) {
|
if (parent_range_allocator) {
|
||||||
m_range_allocator.initialize_from_parent(*parent_range_allocator);
|
m_range_allocator.initialize_from_parent(*parent_range_allocator);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue