RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 03:27:45 +00:00
Code Issues Activity Actions

LibCore: Move LibGUI/GLock to LibCore/CLock.

Browse source
This commit is contained in:
Andreas Kling 2019-04-10 22:39:59 +02:00
parent ab1c84cf53
commit d8e1545783
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Applications/FileManager/DirectoryModel.cpp
View file

@ -8,13 +8,13 @@
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <SharedGraphics/GraphicsBitmap.h>
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <LibGUI/GLock.h> #include <LibCore/CLock.h>
static GLockable<HashMap<String, RetainPtr<GraphicsBitmap>>>& thumbnail_cache() static CLockable<HashMap<String, RetainPtr<GraphicsBitmap>>>& thumbnail_cache()
{ {
static GLockable<HashMap<String, RetainPtr<GraphicsBitmap>>>* s_map; static CLockable<HashMap<String, RetainPtr<GraphicsBitmap>>>* s_map;
if (!s_map) if (!s_map)
s_map = new GLockable<HashMap<String, RetainPtr<GraphicsBitmap>>>(); s_map = new CLockable<HashMap<String, RetainPtr<GraphicsBitmap>>>();
return *s_map; return *s_map;
} }

30
LibGUI/GLock.h → LibCore/CLock.h
View file

@ -17,10 +17,10 @@ static inline dword CAS(volatile dword* mem, dword newval, dword oldval)
return ret; return ret;
} }
class GLock { class CLock {
public: public:
GLock() { } CLock() { }
~GLock() { } ~CLock() { }
void lock(); void lock();
void unlock(); void unlock();
@ -31,18 +31,18 @@ private:
int m_holder { -1 }; int m_holder { -1 };
}; };
class GLocker { class CLocker {
public: public:
[[gnu::always_inline]] inline explicit GLocker(GLock& l) : m_lock(l) { lock(); } [[gnu::always_inline]] inline explicit CLocker(CLock& l) : m_lock(l) { lock(); }
[[gnu::always_inline]] inline ~GLocker() { unlock(); } [[gnu::always_inline]] inline ~CLocker() { unlock(); }
[[gnu::always_inline]] inline void unlock() { m_lock.unlock(); } [[gnu::always_inline]] inline void unlock() { m_lock.unlock(); }
[[gnu::always_inline]] inline void lock() { m_lock.lock(); } [[gnu::always_inline]] inline void lock() { m_lock.lock(); }
private: private:
GLock& m_lock; CLock& m_lock;
}; };
[[gnu::always_inline]] inline void GLock::lock() [[gnu::always_inline]] inline void CLock::lock()
{ {
for (;;) { for (;;) {
if (CAS(&m_lock, 1, 0) == 0) { if (CAS(&m_lock, 1, 0) == 0) {
@ -59,7 +59,7 @@ private:
} }
} }
inline void GLock::unlock() inline void CLock::unlock()
{ {
for (;;) { for (;;) {
if (CAS(&m_lock, 1, 0) == 0) { if (CAS(&m_lock, 1, 0) == 0) {
@ -80,14 +80,14 @@ inline void GLock::unlock()
} }
} }
#define LOCKER(lock) GLocker locker(lock) #define LOCKER(lock) CLocker locker(lock)
template<typename T> template<typename T>
class GLockable { class CLockable {
public: public:
GLockable() { } CLockable() { }
GLockable(T&& resource) : m_resource(move(resource)) { } CLockable(T&& resource) : m_resource(move(resource)) { }
GLock& lock() { return m_lock; } CLock& lock() { return m_lock; }
T& resource() { return m_resource; } T& resource() { return m_resource; }
T lock_and_copy() T lock_and_copy()
@ -98,6 +98,6 @@ public:
private: private:
T m_resource; T m_resource;
GLock m_lock; CLock m_lock;
}; };