Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add garbage collector prologue callback to qv8engine
This commit provides a generic way to manage persistent handles created by QML so that circular references don't cause leaks, by utilising v8's garbage collector callbacks. Change-Id: Ia898197fdf5d86b90915b835ce3e532f7d400de4 Reviewed-on: http://codereview.qt.nokia.com/3688 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
- Loading branch information
Chris Adams
authored and
Qt by Nokia
committed
Sep 6, 2011
1 parent
0c0f03e
commit 08e829e
Showing
10 changed files
with
725 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,112 @@ | ||
/**************************************************************************** | ||
** | ||
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). | ||
** All rights reserved. | ||
** Contact: Nokia Corporation (qt-info@nokia.com) | ||
** | ||
** This file is part of the QtDeclarative module of the Qt Toolkit. | ||
** | ||
** $QT_BEGIN_LICENSE:LGPL$ | ||
** GNU Lesser General Public License Usage | ||
** This file may be used under the terms of the GNU Lesser General Public | ||
** License version 2.1 as published by the Free Software Foundation and | ||
** appearing in the file LICENSE.LGPL included in the packaging of this | ||
** file. Please review the following information to ensure the GNU Lesser | ||
** General Public License version 2.1 requirements will be met: | ||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. | ||
** | ||
** In addition, as a special exception, Nokia gives you certain additional | ||
** rights. These rights are described in the Nokia Qt LGPL Exception | ||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. | ||
** | ||
** GNU General Public License Usage | ||
** Alternatively, this file may be used under the terms of the GNU General | ||
** Public License version 3.0 as published by the Free Software Foundation | ||
** and appearing in the file LICENSE.GPL included in the packaging of this | ||
** file. Please review the following information to ensure the GNU General | ||
** Public License version 3.0 requirements will be met: | ||
** http://www.gnu.org/copyleft/gpl.html. | ||
** | ||
** Other Usage | ||
** Alternatively, this file may be used in accordance with the terms and | ||
** conditions contained in a signed written agreement between you and Nokia. | ||
** | ||
** | ||
** | ||
** | ||
** | ||
** $QT_END_LICENSE$ | ||
** | ||
****************************************************************************/ | ||
|
||
#ifndef QV8GCCALLBACK_P_H | ||
#define QV8GCCALLBACK_P_H | ||
|
||
// | ||
// W A R N I N G | ||
// ------------- | ||
// | ||
// This file is not part of the Qt API. It exists purely as an | ||
// implementation detail. This header file may change from version to | ||
// version without notice, or even be removed. | ||
// | ||
// We mean it. | ||
// | ||
|
||
#include <QtCore/qobject.h> | ||
#include <QtCore/qthreadstorage.h> | ||
#include <private/qv8_p.h> | ||
#include <private/qintrusivelist_p.h> | ||
|
||
QT_BEGIN_NAMESPACE | ||
|
||
class Q_AUTOTEST_EXPORT QV8GCCallback | ||
{ | ||
private: | ||
class ThreadData; | ||
public: | ||
static void garbageCollectorPrologueCallback(v8::GCType, v8::GCCallbackFlags); | ||
static void registerGcPrologueCallback(); | ||
|
||
class Referencer { | ||
public: | ||
~Referencer() {} | ||
void addRelationship(QObject *object, v8::Persistent<v8::Value> handle); | ||
void addRelationship(QObject *object, QObject *other); | ||
private: | ||
Referencer(); | ||
static v8::Persistent<v8::Object> *findOwnerAndStrength(QObject *qobjectOwner, bool *shouldBeStrong); | ||
v8::Persistent<v8::Object> strongReferencer; | ||
friend class QV8GCCallback::ThreadData; | ||
}; | ||
|
||
class Node { | ||
public: | ||
typedef void (*PrologueCallback)(Referencer *r, Node *node); | ||
Node(PrologueCallback callback); | ||
~Node(); | ||
|
||
QIntrusiveListNode node; | ||
PrologueCallback prologueCallback; | ||
}; | ||
|
||
static void addGcCallbackNode(Node *node); | ||
|
||
private: | ||
class ThreadData { | ||
public: | ||
ThreadData() : gcPrologueCallbackRegistered(false) { } | ||
~ThreadData(); | ||
Referencer referencer; | ||
bool gcPrologueCallbackRegistered; | ||
QIntrusiveList<Node, &Node::node> gcCallbackNodes; | ||
}; | ||
|
||
static void initializeThreadData(); | ||
static QThreadStorage<ThreadData *> threadData; | ||
}; | ||
|
||
QT_END_NAMESPACE | ||
|
||
#endif // QV8GCCALLBACK_P_H | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.handle.1.qml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
import QtQuick 2.0 | ||
import Qt.test 1.0 | ||
|
||
Item { | ||
id: obj | ||
objectName: "obj" | ||
property CircularReferenceHandle first | ||
property CircularReferenceHandle second | ||
|
||
CircularReferenceHandle { | ||
id: crh | ||
objectName: "crh" | ||
} | ||
|
||
function createReference() { | ||
first = crh.generate(crh); | ||
second = crh.generate(crh); | ||
// NOTE: manually add reference from first to second | ||
// in unit test prior reparenting and gc. | ||
} | ||
|
||
function performGc() { | ||
gc(); | ||
} | ||
} |
26 changes: 26 additions & 0 deletions
26
tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.handle.2.qml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
import QtQuick 2.0 | ||
import Qt.test 1.0 | ||
|
||
Item { | ||
id: obj | ||
objectName: "obj" | ||
property CircularReferenceHandle first | ||
property CircularReferenceHandle second | ||
|
||
CircularReferenceHandle { | ||
id: crh | ||
objectName: "crh" | ||
} | ||
|
||
function circularReference() { | ||
// generate the circularly referential pair | ||
first = crh.generate(crh); | ||
second = crh.generate(crh); | ||
// note: must manually reparent in unit test | ||
// after setting the handle references. | ||
} | ||
|
||
function performGc() { | ||
gc(); | ||
} | ||
} |
31 changes: 31 additions & 0 deletions
31
tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.object.1.qml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
import QtQuick 2.0 | ||
import Qt.test 1.0 | ||
|
||
Item { | ||
id: obj | ||
objectName: "obj" | ||
|
||
property CircularReferenceObject first | ||
property CircularReferenceObject second | ||
|
||
|
||
CircularReferenceObject { | ||
id: cro | ||
objectName: "cro" | ||
} | ||
|
||
function createReference() { | ||
// generate the objects | ||
first = cro.generate(cro); // has parent, so won't be collected | ||
second = cro.generate(); // no parent, but will be kept alive by first's reference | ||
first.addReference(second); | ||
|
||
// remove top level references | ||
first = cro; | ||
second = cro; | ||
} | ||
|
||
function performGc() { | ||
gc(); | ||
} | ||
} |
32 changes: 32 additions & 0 deletions
32
tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.object.2.qml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
import QtQuick 2.0 | ||
import Qt.test 1.0 | ||
|
||
Item { | ||
id: obj | ||
objectName: "obj" | ||
|
||
property CircularReferenceObject first | ||
property CircularReferenceObject second | ||
|
||
|
||
CircularReferenceObject { | ||
id: cro | ||
objectName: "cro" | ||
} | ||
|
||
function circularReference() { | ||
// generate the circularly referential pair - they should still be collected | ||
first = cro.generate(); // no parent, so should be collected | ||
second = cro.generate(); // no parent, so should be collected | ||
first.addReference(second); | ||
second.addReference(first); | ||
|
||
// remove top level references | ||
first = cro; | ||
second = cro; | ||
} | ||
|
||
function performGc() { | ||
gc(); | ||
} | ||
} |
Oops, something went wrong.