mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 20:07:34 +00:00
Fix broken SpinLock.
The SpinLock was all backwards and didn't actually work. Fixing it exposed how wrong most of the locking here is. I need to come up with a better granularity here.
This commit is contained in:
parent
bea106fdb2
commit
e6284a8774
24 changed files with 195 additions and 77 deletions
52
AK/Lock.h
52
AK/Lock.h
|
@ -2,6 +2,20 @@
|
|||
|
||||
#include "Types.h"
|
||||
|
||||
#ifdef SERENITY
|
||||
#include "i386.h"
|
||||
#else
|
||||
typedef int InterruptDisabler;
|
||||
#endif
|
||||
|
||||
//#define DEBUG_LOCKS
|
||||
|
||||
void log_try_lock(const char*);
|
||||
void log_locked(const char*);
|
||||
void log_unlocked(const char*);
|
||||
|
||||
void yield();
|
||||
|
||||
namespace AK {
|
||||
|
||||
static inline dword CAS(volatile dword* mem, dword newval, dword oldval)
|
||||
|
@ -9,28 +23,46 @@ static inline dword CAS(volatile dword* mem, dword newval, dword oldval)
|
|||
dword ret;
|
||||
asm volatile(
|
||||
"cmpxchgl %2, %1"
|
||||
:"=a"(ret), "=m"(*mem)
|
||||
:"r"(newval), "m"(*mem), "0"(oldval));
|
||||
:"=a"(ret), "+m"(*mem)
|
||||
:"r"(newval), "0"(oldval)
|
||||
:"memory");
|
||||
return ret;
|
||||
}
|
||||
|
||||
class SpinLock {
|
||||
public:
|
||||
SpinLock() { }
|
||||
~SpinLock() { unlock(); }
|
||||
~SpinLock() { }
|
||||
|
||||
void lock()
|
||||
void lock(const char* func = nullptr)
|
||||
{
|
||||
#ifdef DEBUG_LOCKS
|
||||
{
|
||||
InterruptDisabler dis;
|
||||
log_try_lock(func);
|
||||
}
|
||||
#endif
|
||||
for (;;) {
|
||||
if (CAS(&m_lock, 1, 0) == 1)
|
||||
if (CAS(&m_lock, 1, 0) == 0) {
|
||||
#ifdef DEBUG_LOCKS
|
||||
InterruptDisabler dis;
|
||||
log_locked(func);
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
yield();
|
||||
}
|
||||
}
|
||||
|
||||
void unlock()
|
||||
void unlock(const char* func = nullptr)
|
||||
{
|
||||
// barrier();
|
||||
ASSERT(m_lock);
|
||||
m_lock = 0;
|
||||
#ifdef DEBUG_LOCKS
|
||||
InterruptDisabler dis;
|
||||
log_unlocked(func);
|
||||
#endif
|
||||
}
|
||||
|
||||
void init()
|
||||
|
@ -44,14 +76,18 @@ private:
|
|||
|
||||
class Locker {
|
||||
public:
|
||||
explicit Locker(SpinLock& l) : m_lock(l) { m_lock.lock(); }
|
||||
explicit Locker(SpinLock& l, const char* func) : m_lock(l), m_func(func) { lock(); }
|
||||
~Locker() { unlock(); }
|
||||
void unlock() { m_lock.unlock(); }
|
||||
void unlock() { m_lock.unlock(m_func); }
|
||||
void lock() { m_lock.lock(m_func); }
|
||||
|
||||
private:
|
||||
SpinLock& m_lock;
|
||||
const char* m_func { nullptr };
|
||||
};
|
||||
|
||||
#define LOCKER(lock) Locker locker(lock, __FUNCTION__)
|
||||
|
||||
}
|
||||
|
||||
using AK::SpinLock;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue