feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Share Context.

Browse Source 
Previously Context was not entirely thread safe and had to be
copied locally. Now it is thread safe and its lifetime
managed by QSharedPointer.

The non-safe parts were moved into ScopeChain in a previous commit.

Change-Id: I851a93de85cbd6391dbea0fe33b011e2e093addb
Reviewed-on: http://codereview.qt.nokia.com/1695
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
This commit is contained in:
Christian Kamm
2011-07-13 15:04:27 +02:00
parent f87dc61986
commit 9dc9674c6b
28 changed files with 129 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libs/qmljs/qmljscontext.h
View File

@@ -45,18 +45,22 @@ class Snapshot;
namespace Interpreter {
class Context;
typedef QSharedPointer<const Context> ContextPtr;
// shared among threads, completely threadsafe
// currently also safe to copy, but will be deprecated
class QMLJS_EXPORT Context
{
Q_DISABLE_COPY(Context)
public:
typedef QSharedPointer<Context> Ptr;
typedef QHash<const Document *, QSharedPointer<const Imports> > ImportsPerDocument;
// Context takes ownership of valueOwner
Context(const Snapshot &snapshot, ValueOwner *valueOwner, const ImportsPerDocument &imports);
static ContextPtr create(const Snapshot &snapshot, ValueOwner *valueOwner, const ImportsPerDocument &imports);
~Context();
ContextPtr ptr() const;
ValueOwner *valueOwner() const;
Snapshot snapshot() const;
@@ -70,9 +74,13 @@ public:
QString defaultPropertyName(const ObjectValue *object) const;
private:
// Context takes ownership of valueOwner
Context(const Snapshot &snapshot, ValueOwner *valueOwner, const ImportsPerDocument &imports);
Snapshot _snapshot;
QSharedPointer<ValueOwner> _valueOwner;
ImportsPerDocument _imports;
QWeakPointer<const Context> _ptr;
};
// for looking up references
@@ -80,15 +88,15 @@ class QMLJS_EXPORT ReferenceContext
{
public:
// implicit conversion ok
ReferenceContext(const Context *context);
ReferenceContext(const ContextPtr &context);
const Value *lookupReference(const Value *value);
const Context *context() const;
operator const Context *() const;
const ContextPtr &context() const;
operator const ContextPtr &() const;
private:
const Context *m_context;
const ContextPtr &m_context;
QList<const Reference *> m_references;
};