RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 19:38:12 +00:00
Code Issues Activity Actions

LibCore: Make CObject reference-counted

Browse source 
Okay, I've spent a whole day on this now, and it finally kinda works!
With this patch, CObject and all of its derived classes are reference
counted instead of tree-owned.

The previous, Qt-like model was nice and familiar, but ultimately also
outdated and difficult to reason about.

CObject-derived types should now be stored in RefPtr/NonnullRefPtr and
each class can be constructed using the forwarding construct() helper:

    auto widget = GWidget::construct(parent_widget);

Note that construct() simply forwards all arguments to an existing
constructor. It is inserted into each class by the C_OBJECT macro,
see CObject.h to understand how that works.

CObject::delete_later() disappears in this patch, as there is no longer
a single logical owner of a CObject.
This commit is contained in:
Andreas Kling 2019-09-22 00:17:53 +02:00
parent 0c72e0c09f
commit bc319d9e88
45 changed files with 174 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Libraries/LibCore/CObject.h
View file

@ -2,6 +2,8 @@
#include <AK/Function.h>
#include <AK/IntrusiveList.h>
#include <AK/Noncopyable.h>
#include <AK/NonnullRefPtrVector.h>
#include <AK/StdLibExtras.h>
#include <AK/String.h>
#include <AK/Vector.h>
@ -21,13 +23,18 @@ class CTimerEvent;
public: \
virtual const char* class_name() const override { return #klass; } \
template<class... Args> \
static inline ObjectPtr<klass> construct(Args&&... args) \
static inline NonnullRefPtr<klass> construct(Args&&... args) \
{ \
return ObjectPtr<klass>(new klass(forward<Args>(args)...)); \
return adopt(*new klass(forward<Args>(args)...)); \
}
class CObject : public Weakable<CObject> {
class CObject
: public RefCounted<CObject>
, public Weakable<CObject> {
// NOTE: No C_OBJECT macro for CObject itself.
AK_MAKE_NONCOPYABLE(CObject)
AK_MAKE_NONMOVABLE(CObject)
public:
IntrusiveListNode m_all_objects_list_node;
@ -39,14 +46,14 @@ public:
const String& name() const { return m_name; }
void set_name(const StringView& name) { m_name = name; }
Vector<CObject*>& children() { return m_children; }
const Vector<CObject*>& children() const { return m_children; }
NonnullRefPtrVector<CObject>& children() { return m_children; }
const NonnullRefPtrVector<CObject>& children() const { return m_children; }
template<typename Callback>
void for_each_child(Callback callback)
{
for (auto* child : m_children) {
if (callback(*child) == IterationDecision::Break)
for (auto& child : m_children) {
if (callback(child) == IterationDecision::Break)
return;
}
}
@ -66,8 +73,6 @@ public:
void add_child(CObject&);
void remove_child(CObject&);
void delete_later();
void dump_tree(int indent = 0);
void deferred_invoke(Function<void(CObject&)>);
@ -95,7 +100,7 @@ private:
String m_name;
int m_timer_id { 0 };
bool m_widget { false };
Vector<CObject*> m_children;
NonnullRefPtrVector<CObject> m_children;
};
template<typename T>