SerenityOS/serenity
1
0 Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2026-11-07 04:29:30 -10:00
Code Issues Packages Projects Releases Wiki Activity

Kernel: Remove Locked from SpinlockProtectedBase

Browse Source 
Simplify SpinlockProtectedBase by using SpinlockLocker directly in
with(). This removes the redundant Locked abstraction and makes the
locking lifetime explicit.
This commit is contained in:
Moses authored and Lucas Chollet committed 2026-09-28 09:12:58 +02:00
1 parent 30fddf9f18
commit d4efdfd6d0
1 file changed
+4 -34
Download Patch File Download Diff File Expand all files Collapse all files
Kernel/Locking/SpinlockProtectedBase.h
+4 -34
View File
@@ -18,36 +18,6 @@ class SpinlockProtectedBase {
AK_MAKE_NONMOVABLE(SpinlockProtectedBase);
friend class WaitQueue;
private:
template<typename U>
class Locked {
AK_MAKE_NONCOPYABLE(Locked);
AK_MAKE_NONMOVABLE(Locked);
public:
Locked(U& value, Lock& spinlock)
: m_value(value)
, m_locker(spinlock)
{
}
ALWAYS_INLINE U const* operator->() const { return &m_value; }
ALWAYS_INLINE U const& operator*() const { return m_value; }
ALWAYS_INLINE U* operator->() { return &m_value; }
ALWAYS_INLINE U& operator*() { return m_value; }
ALWAYS_INLINE U const& get() const { return m_value; }
ALWAYS_INLINE U& get() { return m_value; }
private:
U& m_value;
SpinlockLocker<Lock> m_locker;
};
auto lock_const() const { return Locked<T const>(m_value, m_spinlock); }
auto lock_mutable() { return Locked<T>(m_value, m_spinlock); }
public:
template<typename... Args>
SpinlockProtectedBase(Args&&... args)
@@ -58,15 +28,15 @@ public:
template<typename Callback>
decltype(auto) with(Callback callback) const
{
auto lock = lock_const();
return callback(*lock);
SpinlockLocker<Lock> locker(m_spinlock);
return callback(m_value);
}
template<typename Callback>
decltype(auto) with(Callback callback)
{
auto lock = lock_mutable();
return callback(*lock);
SpinlockLocker<Lock> locker(m_spinlock);
return callback(m_value);
}
template<typename Callback>