Преглед изворни кода

Kernel: Move Lock code out-of-line.

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.
Andreas Kling пре 6 година
родитељ
комит
c59fdcc021
2 измењених фајлова са 1 додато и 68 уклоњено
  1. 0 68
      Kernel/Lock.h
  2. 1 0
      Kernel/Makefile

+ 0 - 68
Kernel/Lock.h

@@ -56,74 +56,6 @@ private:
     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)
 

+ 1 - 0
Kernel/Makefile

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