RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-13 18:12:08 +00:00
Code Issues Activity Actions

Kernel: Move Lock code out-of-line.

Browse source 
It's so big and chunky anyway, it's silly to expand it everywhere.
This makes it a lot easier to read function disassembly dumps.
This commit is contained in:
Andreas Kling 2019-07-29 10:55:29 +02:00
parent 5ded77df39
commit c59fdcc021
2 changed files with 1 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

68
Kernel/Lock.h
View file

@ -56,74 +56,6 @@ private:
Lock& m_lock; Lock& m_lock;
}; };
[[gnu::always_inline]] inline void Lock::lock()
{
if (!are_interrupts_enabled()) {
kprintf("Interrupts disabled when trying to take Lock{%s}\n", m_name);
dump_backtrace();
hang();
}
ASSERT(!Scheduler::is_active());
for (;;) {
if (CAS(&m_lock, 1, 0) == 0) {
if (!m_holder || m_holder == current) {
m_holder = current;
++m_level;
memory_barrier();
m_lock = 0;
return;
}
m_lock = 0;
}
Scheduler::donate_to(m_holder, m_name);
}
}
inline void Lock::unlock()
{
for (;;) {
if (CAS(&m_lock, 1, 0) == 0) {
ASSERT(m_holder == current);
ASSERT(m_level);
--m_level;
if (m_level) {
memory_barrier();
m_lock = 0;
return;
}
m_holder = nullptr;
memory_barrier();
m_lock = 0;
return;
}
Scheduler::donate_to(m_holder, m_name);
}
}
inline bool Lock::unlock_if_locked()
{
for (;;) {
if (CAS(&m_lock, 1, 0) == 0) {
if (m_level == 0) {
memory_barrier();
m_lock = 0;
return false;
}
ASSERT(m_holder == current);
ASSERT(m_level);
--m_level;
if (m_level) {
memory_barrier();
m_lock = 0;
return false;
}
m_holder = nullptr;
memory_barrier();
m_lock = 0;
return true;
}
}
}
#define LOCKER(lock) Locker locker(lock) #define LOCKER(lock) Locker locker(lock)

1
Kernel/Makefile
View file

@ -4,6 +4,7 @@ KERNEL_OBJS = \
init.o \ init.o \
kmalloc.o \ kmalloc.o \
StdLib.o \ StdLib.o \
Lock.o \
Arch/i386/CPU.o \ Arch/i386/CPU.o \
Process.o \ Process.o \
SharedBuffer.o \ SharedBuffer.o \